X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/2928f08da5f5bf39dae53c2c9f897ee0d313e9d2..c9d443ea4ab1a6c031306afe95f5e9e92d61d693:/lib/constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 2e0b8d9..abfb1ea 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -283,12 +283,16 @@ 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_PARAMETERS = frozenset([
   HV_BOOT_ORDER,
@@ -296,12 +300,16 @@ 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,
+  HV_USB_MOUSE,
   ])
 
 # BE parameter names
@@ -327,21 +335,38 @@ 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])
 
-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'
@@ -422,41 +447,52 @@ 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,
-        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,
-        },
-    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_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_ACPI: True,
+    HV_SERIAL_CONSOLE: True,
+    HV_VNC_BIND_ADDRESS: None,
+    HV_VNC_TLS: False,
+    HV_VNC_X509: '',
+    HV_VNC_X509_VERIFY: False,
+    HV_CDROM_IMAGE_PATH: None,
+    HV_BOOT_ORDER: "disk",
+    HV_NIC_TYPE: HT_NIC_PARAVIRTUAL,
+    HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
+    HV_USB_MOUSE: None,
+    },
+  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