Update the iallocator documentation

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index a50526e..a77544d 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -24,7 +24,7 @@
 from ganeti import _autoconf
 
 # various versions
-PROTOCOL_VERSION = 13
+PROTOCOL_VERSION = 20
 RELEASE_VERSION = _autoconf.PACKAGE_VERSION
 OS_API_VERSION = 10
 EXPORT_VERSION = 0
@@ -148,7 +148,7 @@ HOOKS_BASE_DIR = _autoconf.SYSCONFDIR + "/ganeti/hooks"
 HOOKS_PHASE_PRE = "pre"
 HOOKS_PHASE_POST = "post"
 HOOKS_NAME_CFGUPDATE = "config-update"
-HOOKS_VERSION = 1
+HOOKS_VERSION = 2
 
 # hooks subject type (what object type does the LU deal with)
 HTYPE_CLUSTER = "CLUSTER"
@@ -299,6 +299,7 @@ HV_VNC_X509 = "vnc_x509_path"
 HV_VNC_X509_VERIFY = "vnc_x509_verify"
 HV_ACPI = "acpi"
 HV_PAE = "pae"
+HV_KERNEL_ARGS = "kernel_args"
 HV_KERNEL_PATH = "kernel_path"
 HV_INITRD_PATH = "initrd_path"
 HV_ROOT_PATH = "root_path"
@@ -317,6 +318,7 @@ HVS_PARAMETER_TYPES = {
   HV_ACPI: VTYPE_BOOL,
   HV_PAE: VTYPE_BOOL,
   HV_KERNEL_PATH: VTYPE_STRING,
+  HV_KERNEL_ARGS: VTYPE_STRING,
   HV_INITRD_PATH: VTYPE_STRING,
   HV_ROOT_PATH: VTYPE_STRING,
   HV_SERIAL_CONSOLE: VTYPE_BOOL,
@@ -400,6 +402,7 @@ NV_VGLIST = "vglist"
 NV_DRBDLIST = "drbd-list"
 
 # Allocator framework constants
+IALLOCATOR_VERSION = 2
 IALLOCATOR_DIR_IN = "in"
 IALLOCATOR_DIR_OUT = "out"
 IALLOCATOR_MODE_ALLOC = "allocate"
@@ -473,7 +476,8 @@ HVC_DEFAULTS = {
   HT_XEN_PVM: {
     HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
     HV_INITRD_PATH: '',
-    HV_ROOT_PATH: '/dev/sda',
+    HV_ROOT_PATH: '/dev/sda1',
+    HV_KERNEL_ARGS: 'ro',
     },
   HT_XEN_HVM: {
     HV_BOOT_ORDER: "cd",
@@ -487,7 +491,8 @@ HVC_DEFAULTS = {
   HT_KVM: {
     HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU",
     HV_INITRD_PATH: '',
-    HV_ROOT_PATH: '/dev/vda',
+    HV_KERNEL_ARGS: 'ro',
+    HV_ROOT_PATH: '/dev/vda1',
     HV_ACPI: True,
     HV_SERIAL_CONSOLE: True,
     HV_VNC_BIND_ADDRESS: '',