Convert default root partition to msdos style

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 367b31c..1cd7b8e 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -277,43 +277,66 @@ REBOOT_TYPES = frozenset([INSTANCE_REBOOT_SOFT,
                           INSTANCE_REBOOT_HARD,
                           INSTANCE_REBOOT_FULL])
 
+VTYPE_STRING = 'string'
+VTYPE_BOOL = 'bool'
+VTYPE_SIZE = 'size' # size, in MiBs
+VTYPE_INT = 'int'
+ENFORCEABLE_TYPES = frozenset([
+                      VTYPE_STRING,
+                      VTYPE_BOOL,
+                      VTYPE_SIZE,
+                      VTYPE_INT,
+                      ])
+
 # HV parameter names (global namespace)
 HV_BOOT_ORDER = "boot_order"
 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"
+HV_USB_MOUSE = "usb_mouse"
+
+HVS_PARAMETER_TYPES = {
+  HV_BOOT_ORDER: VTYPE_STRING,
+  HV_CDROM_IMAGE_PATH: VTYPE_STRING,
+  HV_NIC_TYPE: VTYPE_STRING,
+  HV_DISK_TYPE: VTYPE_STRING,
+  HV_VNC_BIND_ADDRESS: VTYPE_STRING,
+  HV_VNC_TLS: VTYPE_BOOL,
+  HV_VNC_X509: VTYPE_STRING,
+  HV_VNC_X509_VERIFY: VTYPE_BOOL,
+  HV_ACPI: VTYPE_BOOL,
+  HV_PAE: VTYPE_BOOL,
+  HV_KERNEL_PATH: VTYPE_STRING,
+  HV_INITRD_PATH: VTYPE_STRING,
+  HV_ROOT_PATH: VTYPE_STRING,
+  HV_SERIAL_CONSOLE: VTYPE_BOOL,
+  HV_USB_MOUSE: VTYPE_STRING,
+  }
 
-HVS_PARAMETERS = frozenset([
-  HV_BOOT_ORDER,
-  HV_CDROM_IMAGE_PATH,
-  HV_NIC_TYPE,
-  HV_DISK_TYPE,
-  HV_VNC_BIND_ADDRESS,
-  HV_ACPI,
-  HV_PAE,
-  HV_KERNEL_PATH,
-  HV_INITRD_PATH,
-  HV_ROOT_PATH,
-  HV_SERIAL_CONSOLE,
-  ])
+HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
 
 # BE parameter names
 BE_MEMORY = "memory"
 BE_VCPUS = "vcpus"
 BE_AUTO_BALANCE = "auto_balance"
 
-BES_PARAMETERS = frozenset([
-  BE_MEMORY,
-  BE_VCPUS,
-  BE_AUTO_BALANCE,
-  ])
+BES_PARAMETER_TYPES = {
+    BE_MEMORY: VTYPE_SIZE,
+    BE_VCPUS: VTYPE_INT,
+    BE_AUTO_BALANCE: VTYPE_BOOL,
+    }
+
+BES_PARAMETERS = frozenset(BES_PARAMETER_TYPES.keys())
 
 # BE GROUP
 BEGR_DEFAULT = "default"
@@ -325,23 +348,40 @@ 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])
 
-HT_HVM_VNC_BASE_PORT = 5900
-HT_HVM_DEFAULT_BOOT_ORDER = 'dc'
+VNC_BASE_PORT = 5900
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
 VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
 
-# HVM NIC types
-HT_HVM_NIC_RTL8139 = "rtl8139"
-HT_HVM_NIC_NE2K_PCI = "ne2k_pci"
-HT_HVM_NIC_NE2K_ISA = "ne2k_isa"
-HT_HVM_DEV_PARAVIRTUAL = "paravirtual"
-HT_HVM_DEV_IOEMU = "ioemu"
-HT_HVM_VALID_NIC_TYPES = frozenset([HT_HVM_NIC_RTL8139, HT_HVM_NIC_NE2K_PCI,
-                                    HT_HVM_NIC_NE2K_ISA,
-                                    HT_HVM_DEV_PARAVIRTUAL])
-HT_HVM_VALID_DISK_TYPES = frozenset([HT_HVM_DEV_PARAVIRTUAL, HT_HVM_DEV_IOEMU])
+# Device types
+HT_NIC_RTL8139 = "rtl8139"
+HT_NIC_NE2K_PCI = "ne2k_pci"
+HT_NIC_NE2K_ISA = "ne2k_isa"
+HT_NIC_I82551 = "i82551"
+HT_NIC_I85557B = "i82557b"
+HT_NIC_I8259ER = "i82559er"
+HT_NIC_PCNET = "pcnet"
+HT_NIC_E1000 = "e1000"
+HT_NIC_PARAVIRTUAL = HT_DISK_PARAVIRTUAL = "paravirtual"
+HT_DISK_IOEMU = "ioemu"
+HT_DISK_IDE = "ide"
+HT_DISK_SCSI = "scsi"
+HT_DISK_SD = "sd"
+HT_DISK_MTD = "mtd"
+HT_DISK_PFLASH = "pflash"
+
+HT_HVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+                                    HT_NIC_NE2K_ISA, HT_NIC_PARAVIRTUAL])
+HT_HVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IOEMU])
+HT_KVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+                                    HT_NIC_NE2K_ISA, HT_NIC_I82551,
+                                    HT_NIC_I85557B, HT_NIC_I8259ER,
+                                    HT_NIC_PCNET, HT_NIC_E1000,
+                                    HT_NIC_PARAVIRTUAL])
+HT_KVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IDE,
+                                     HT_DISK_SCSI, HT_DISK_SD, HT_DISK_MTD,
+                                     HT_DISK_PFLASH])
 
 # Cluster Verify steps
 VERIFY_NPLUSONE_MEM = 'nplusone_mem'
@@ -432,25 +472,33 @@ DEFAULT_ENABLED_HYPERVISOR = HT_XEN_PVM
 HVC_DEFAULTS = {
   HT_XEN_PVM: {
     HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
-    HV_INITRD_PATH: None,
-    HV_ROOT_PATH: '/dev/sda',
+    HV_INITRD_PATH: '',
+    HV_ROOT_PATH: '/dev/sda1',
     },
   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_CDROM_IMAGE_PATH: '',
+    HV_NIC_TYPE: HT_NIC_RTL8139,
+    HV_DISK_TYPE: HT_DISK_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_INITRD_PATH: '',
+    HV_ROOT_PATH: '/dev/vda1',
     HV_ACPI: True,
     HV_SERIAL_CONSOLE: True,
-    HV_VNC_BIND_ADDRESS: None,
+    HV_VNC_BIND_ADDRESS: '',
+    HV_VNC_TLS: False,
+    HV_VNC_X509: '',
+    HV_VNC_X509_VERIFY: False,
+    HV_CDROM_IMAGE_PATH: '',
+    HV_BOOT_ORDER: "disk",
+    HV_NIC_TYPE: HT_NIC_PARAVIRTUAL,
+    HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
+    HV_USB_MOUSE: '',
     },
   HT_FAKE: {
     },