KVM: add the HV_SERIAL_CONSOLE parameter

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 84e7b59..7efb21d 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"
@@ -193,9 +194,9 @@ DISK_RDWR = "rw"
 DISK_ACCESS_SET = frozenset([DISK_RDONLY, DISK_RDWR])
 
 # disk replacement mode
-REPLACE_DISK_PRI = "replace_primary"
-REPLACE_DISK_SEC = "replace_secondary"
-REPLACE_DISK_ALL = "replace_all"
+REPLACE_DISK_PRI = "replace_on_primary"    # replace disks on primary
+REPLACE_DISK_SEC = "replace_on_secondary"  # replace disks on secondary
+REPLACE_DISK_CHG = "replace_new_secondary" # change secondary node
 
 # lock recalculate mode
 LOCKS_REPLACE = 'replace'
@@ -235,13 +236,14 @@ MAX_TAGS_PER_OBJ = 4096
 
 # others
 DEFAULT_BRIDGE = "xen-br0"
-SYNC_SPEED = 30 * 1024
+SYNC_SPEED = 60 * 1024
 LOCALHOST_IP_ADDRESS = "127.0.0.1"
 TCP_PING_TIMEOUT = 10
 GANETI_RUNAS = "root"
 DEFAULT_VG = "xenvg"
 BIND_ADDRESS_GLOBAL = "0.0.0.0"
 MIN_VG_SIZE = 20480
+DEFAULT_MAC_PREFIX = "aa:00:00"
 
 # RPC constants
 (RPC_ENCODING_NONE,
@@ -285,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,
@@ -296,6 +300,8 @@ HVS_PARAMETERS = frozenset([
   HV_PAE,
   HV_KERNEL_PATH,
   HV_INITRD_PATH,
+  HV_ROOT_PATH,
+  HV_SERIAL_CONSOLE,
   ])
 
 # BE parameter names
@@ -350,6 +356,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"
@@ -401,7 +408,7 @@ ELOG_PROGRESS = "progress"
 RAPI_ENABLE = True
 RAPI_PORT = 5080
 
-# max dynamnic devices
+# max dynamic devices
 MAX_NICS = 8
 MAX_DISKS = 16
 
@@ -414,6 +421,7 @@ SS_MASTER_NETDEV = "master_netdev"
 SS_MASTER_NODE = "master_node"
 SS_NODE_LIST = "node_list"
 SS_OFFLINE_NODES = "offline_nodes"
+SS_RELEASE_VERSION = "release_version"
 
 # cluster wide default parameters
 DEFAULT_ENABLED_HYPERVISOR = HT_XEN_PVM
@@ -422,6 +430,7 @@ 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",
@@ -435,7 +444,9 @@ HVC_DEFAULTS = {
     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: {
         },