Revision 6e6bb8d5 lib/hypervisor/hv_xen.py
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
526 | 526 |
"VNC bind address is not a valid IP address", None, None), |
527 | 527 |
constants.HV_KERNEL_PATH: hv_base.REQ_FILE_CHECK, |
528 | 528 |
constants.HV_DEVICE_MODEL: hv_base.REQ_FILE_CHECK, |
529 |
constants.HV_VNC_PASSWORD_FILE: hv_base.REQ_FILE_CHECK, |
|
529 | 530 |
} |
530 | 531 |
|
531 | 532 |
@classmethod |
... | ... | |
574 | 575 |
config.write("# vncdisplay = 1\n") |
575 | 576 |
config.write("vncunused = 1\n") |
576 | 577 |
|
578 |
vnc_pwd_file = hvp[constants.HV_VNC_PASSWORD_FILE] |
|
577 | 579 |
try: |
578 |
password = utils.ReadFile(constants.VNC_PASSWORD_FILE)
|
|
580 |
password = utils.ReadFile(vnc_pwd_file)
|
|
579 | 581 |
except EnvironmentError, err: |
580 | 582 |
raise errors.HypervisorError("Failed to open VNC password file %s: %s" % |
581 |
(constants.VNC_PASSWORD_FILE, err))
|
|
583 |
(vnc_pwd_file, err))
|
|
582 | 584 |
|
583 | 585 |
config.write("vncpasswd = '%s'\n" % password.rstrip()) |
584 | 586 |
|
Also available in: Unified diff