Revision 146afafb lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 707 | 707 |
vnc_bind_address) |
| 708 | 708 |
|
| 709 | 709 |
if hvparams[constants.HV_VNC_X509_VERIFY] and \ |
| 710 |
not hvparams[constants.HV_VNC_X509]: |
|
| 711 |
raise errors.HypervisorError("%s must be defined, if %s is" %
|
|
| 712 |
(constants.HV_VNC_X509,
|
|
| 713 |
constants.HV_VNC_X509_VERIFY))
|
|
| 710 |
not hvparams[constants.HV_VNC_X509]:
|
|
| 711 |
raise errors.HypervisorError("%s must be defined, if %s is" %
|
|
| 712 |
(constants.HV_VNC_X509, |
|
| 713 |
constants.HV_VNC_X509_VERIFY)) |
|
| 714 | 714 |
|
| 715 | 715 |
if hvparams[constants.HV_VNC_X509]: |
| 716 | 716 |
if not os.path.isabs(hvparams[constants.HV_VNC_X509]): |
| ... | ... | |
| 777 | 777 |
|
| 778 | 778 |
vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS] |
| 779 | 779 |
if vnc_bind_address and not utils.IsValidIP(vnc_bind_address) and \ |
| 780 |
not os.path.isdir(vnc_bind_address): |
|
| 781 |
raise errors.HypervisorError("Instance vnc bind address must be either"
|
|
| 782 |
" an ip address or an existing directory")
|
|
| 780 |
not os.path.isdir(vnc_bind_address):
|
|
| 781 |
raise errors.HypervisorError("Instance vnc bind address must be either"
|
|
| 782 |
" an ip address or an existing directory") |
|
| 783 | 783 |
|
| 784 | 784 |
vnc_x509 = hvparams[constants.HV_VNC_X509] |
| 785 | 785 |
if vnc_x509 and not os.path.isdir(vnc_x509): |
Also available in: Unified diff