Commit ccd905ac authored by Guido Trotter's avatar Guido Trotter
Browse files

HTS_USE_VNC, rename and remove KVM

Currently we use the HTS_USE_VNC constant only to copy the vnc password
file. While KVM uses vnc it currently has no password support, nor we'll
be on time making one for 2.0, so renaming the constant to
HTS_COPY_VNC_PASSWORD and only putting Xen HVM in it. In the future
(2.1) password handling will need to be reworked anyway.

Reviewed-by: iustinp
parent ae07a1d3
......@@ -2209,7 +2209,7 @@ class LUAddNode(LogicalUnit):
to_copy = []
enabled_hypervisors = self.cfg.GetClusterInfo().enabled_hypervisors
if constants.HTS_USE_VNC.intersection(enabled_hypervisors):
if constants.HTS_COPY_VNC_PASSWORD.intersection(enabled_hypervisors):
to_copy.append(constants.VNC_PASSWORD_FILE)
for fname in to_copy:
......
......@@ -348,7 +348,7 @@ HT_XEN_HVM = "xen-hvm"
HT_KVM = "kvm"
HYPER_TYPES = frozenset([HT_XEN_PVM, HT_FAKE, HT_XEN_HVM, HT_KVM])
HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
HTS_USE_VNC = frozenset([HT_XEN_HVM, HT_KVM])
HTS_COPY_VNC_PASSWORD = frozenset([HT_XEN_HVM])
VNC_BASE_PORT = 5900
VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment