Add "variants" field to LUDiagnoseOS

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 1ad4461..7847316 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -159,6 +159,7 @@ EXPORT_DIR = _autoconf.EXPORT_DIR
 
 EXPORT_CONF_FILE = "config.ini"
 
+XEN_BOOTLOADER = _autoconf.XEN_BOOTLOADER
 XEN_KERNEL = _autoconf.XEN_KERNEL
 XEN_INITRD = _autoconf.XEN_INITRD
 
@@ -327,6 +328,9 @@ OS_SCRIPT_RENAME = 'rename'
 OS_SCRIPTS = frozenset([OS_SCRIPT_CREATE, OS_SCRIPT_IMPORT,
                         OS_SCRIPT_EXPORT, OS_SCRIPT_RENAME])
 
+OS_API_FILE = 'ganeti_api_version'
+OS_VARIANTS_FILE = 'variants.list'
+
 # ssh constants
 SSH_INITD_SCRIPT = _autoconf.SSH_INITD_SCRIPT
 SSH_CONFIG_DIR = "/etc/ssh/"
@@ -368,6 +372,9 @@ HV_VNC_X509 = "vnc_x509_path"
 HV_VNC_X509_VERIFY = "vnc_x509_verify"
 HV_ACPI = "acpi"
 HV_PAE = "pae"
+HV_USE_BOOTLOADER = "use_bootloader"
+HV_BOOTLOADER_ARGS = "bootloader_args"
+HV_BOOTLOADER_PATH = "bootloader_path"
 HV_KERNEL_ARGS = "kernel_args"
 HV_KERNEL_PATH = "kernel_path"
 HV_INITRD_PATH = "initrd_path"
@@ -388,6 +395,9 @@ HVS_PARAMETER_TYPES = {
   HV_VNC_X509_VERIFY: VTYPE_BOOL,
   HV_ACPI: VTYPE_BOOL,
   HV_PAE: VTYPE_BOOL,
+  HV_USE_BOOTLOADER: VTYPE_BOOL,
+  HV_BOOTLOADER_PATH: VTYPE_STRING,
+  HV_BOOTLOADER_ARGS: VTYPE_STRING,
   HV_KERNEL_PATH: VTYPE_STRING,
   HV_KERNEL_ARGS: VTYPE_STRING,
   HV_INITRD_PATH: VTYPE_STRING,
@@ -580,6 +590,9 @@ DEFAULT_ENABLED_HYPERVISOR = HT_XEN_PVM
 
 HVC_DEFAULTS = {
   HT_XEN_PVM: {
+    HV_USE_BOOTLOADER: False,
+    HV_BOOTLOADER_PATH: XEN_BOOTLOADER,
+    HV_BOOTLOADER_ARGS: '',
     HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
     HV_INITRD_PATH: '',
     HV_ROOT_PATH: '/dev/sda1',
@@ -641,6 +654,7 @@ CONFD_REQ_NODE_PIP_BY_INSTANCE_IP = 2
 CONFD_REQ_CLUSTER_MASTER = 3
 CONFD_REQ_NODE_PIP_LIST = 4
 CONFD_REQ_MC_PIP_LIST = 5
+CONFD_REQ_INSTANCES_IPS_LIST = 6
 
 CONFD_REQS = frozenset([
   CONFD_REQ_PING,
@@ -649,6 +663,7 @@ CONFD_REQS = frozenset([
   CONFD_REQ_CLUSTER_MASTER,
   CONFD_REQ_NODE_PIP_LIST,
   CONFD_REQ_MC_PIP_LIST,
+  CONFD_REQ_INSTANCES_IPS_LIST,
   ])
 
 CONFD_REPL_STATUS_OK = 0