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 a483165..0b43a12 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -134,6 +134,7 @@ XEN_INITRD = _autoconf.XEN_INITRD
 
 KVM_PATH = _autoconf.KVM_PATH
 SOCAT_PATH = _autoconf.SOCAT_PATH
+KVM_MIGRATION_PORT = _autoconf.KVM_MIGRATION_PORT
 
 VALUE_DEFAULT = "default"
 VALUE_AUTO = "auto"
@@ -282,10 +283,15 @@ 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"
 HV_INITRD_PATH = "initrd_path"
+HV_ROOT_PATH = "root_path"
+HV_SERIAL_CONSOLE = "serial_console"
 
 HVS_PARAMETERS = frozenset([
   HV_BOOT_ORDER,
@@ -293,10 +299,15 @@ 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,
   HV_INITRD_PATH,
+  HV_ROOT_PATH,
+  HV_SERIAL_CONSOLE,
   ])
 
 # BE parameter names
@@ -319,10 +330,10 @@ HT_FAKE = "fake"
 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])
+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'
 
@@ -351,6 +362,7 @@ NV_NODELIST = "nodelist"
 NV_NODENETTEST = "node-net-test"
 NV_VERSION = "version"
 NV_VGLIST = "vglist"
+NV_DRBDLIST = "drbd-list"
 
 # Allocator framework constants
 IALLOCATOR_DIR_IN = "in"
@@ -415,38 +427,47 @@ 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
 DEFAULT_ENABLED_HYPERVISOR = HT_XEN_PVM
 
 HVC_DEFAULTS = {
-    HT_XEN_PVM: {
-        HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
-        HV_INITRD_PATH: None,
-        },
-    HT_XEN_HVM: {
-        HV_BOOT_ORDER: "cd",
-        HV_CDROM_IMAGE_PATH: None,
-        HV_NIC_TYPE: HT_HVM_NIC_RTL8139,
-        HV_DISK_TYPE: HT_HVM_DEV_PARAVIRTUAL,
-        HV_VNC_BIND_ADDRESS: '0.0.0.0',
-        HV_ACPI: True,
-        HV_PAE: True,
-        },
-    HT_KVM: {
-        HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU",
-        HV_INITRD_PATH: None,
-        HV_ACPI: True,
-        },
-    HT_FAKE: {
-        },
-    }
+  HT_XEN_PVM: {
+    HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
+    HV_INITRD_PATH: None,
+    HV_ROOT_PATH: '/dev/sda',
+    },
+  HT_XEN_HVM: {
+    HV_BOOT_ORDER: "cd",
+    HV_CDROM_IMAGE_PATH: None,
+    HV_NIC_TYPE: HT_HVM_NIC_RTL8139,
+    HV_DISK_TYPE: HT_HVM_DEV_PARAVIRTUAL,
+    HV_VNC_BIND_ADDRESS: '0.0.0.0',
+    HV_ACPI: True,
+    HV_PAE: True,
+    },
+  HT_KVM: {
+    HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU",
+    HV_INITRD_PATH: None,
+    HV_ROOT_PATH: '/dev/vda',
+    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: {
+    },
+  }
 
 BEC_DEFAULTS = {
-    BE_MEMORY: 128,
-    BE_VCPUS: 1,
-    BE_AUTO_BALANCE: True,
-    }
+  BE_MEMORY: 128,
+  BE_VCPUS: 1,
+  BE_AUTO_BALANCE: True,
+  }
 
 MASTER_POOL_SIZE_DEFAULT = 10