Get rid of constants.HT_HVM_DEFAULT_BOOT_ORDER

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 1711728..0b43a12 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -283,6 +283,9 @@ HV_CDROM_IMAGE_PATH = "cdrom_image_path"
 HV_NIC_TYPE = "nic_type"
 HV_DISK_TYPE = "disk_type"
 HV_VNC_BIND_ADDRESS = "vnc_bind_address"
+HV_VNC_TLS = "vnc_tls"
+HV_VNC_X509 = "vnc_x509_path"
+HV_VNC_X509_VERIFY = "vnc_x509_verify"
 HV_ACPI = "acpi"
 HV_PAE = "pae"
 HV_KERNEL_PATH = "kernel_path"
@@ -296,6 +299,9 @@ HVS_PARAMETERS = frozenset([
   HV_NIC_TYPE,
   HV_DISK_TYPE,
   HV_VNC_BIND_ADDRESS,
+  HV_VNC_TLS,
+  HV_VNC_X509,
+  HV_VNC_X509_VERIFY,
   HV_ACPI,
   HV_PAE,
   HV_KERNEL_PATH,
@@ -328,7 +334,6 @@ HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
 HTS_USE_VNC = frozenset([HT_XEN_HVM, HT_KVM])
 
 HT_HVM_VNC_BASE_PORT = 5900
-HT_HVM_DEFAULT_BOOT_ORDER = 'dc'
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
 VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
 
@@ -422,6 +427,8 @@ SS_MASTER_NETDEV = "master_netdev"
 SS_MASTER_NODE = "master_node"
 SS_NODE_LIST = "node_list"
 SS_OFFLINE_NODES = "offline_nodes"
+SS_ONLINE_NODES = "online_nodes"
+SS_INSTANCE_LIST = "instance_list"
 SS_RELEASE_VERSION = "release_version"
 
 # cluster wide default parameters
@@ -449,6 +456,9 @@ HVC_DEFAULTS = {
     HV_ACPI: True,
     HV_SERIAL_CONSOLE: True,
     HV_VNC_BIND_ADDRESS: None,
+    HV_VNC_TLS: False,
+    HV_VNC_X509: '',
+    HV_VNC_X509_VERIFY: False,
     },
   HT_FAKE: {
     },