ssh: more details on failure

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index a483165..1711728 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"
@@ -286,6 +287,8 @@ 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,
@@ -297,6 +300,8 @@ HVS_PARAMETERS = frozenset([
   HV_PAE,
   HV_KERNEL_PATH,
   HV_INITRD_PATH,
+  HV_ROOT_PATH,
+  HV_SERIAL_CONSOLE,
   ])
 
 # BE parameter names
@@ -319,7 +324,8 @@ 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'
@@ -351,6 +357,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"
@@ -421,32 +428,36 @@ SS_RELEASE_VERSION = "release_version"
 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,
+    },
+  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