Annotate disk params on instance_os_add

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index c24be15..b76863e 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -120,6 +120,7 @@ CPU_PINNING_ALL_XEN = "0-63"
 # A KVM-specific implementation detail - the following value is used
 # to set CPU affinity to all processors (#0 through #31), per taskset
 # man page.
+# FIXME: This only works for machines with up to 32 CPU cores
 CPU_PINNING_ALL_KVM = 0xFFFFFFFF
 
 # Wipe
@@ -266,7 +267,10 @@ EXPORT_CONF_FILE = "config.ini"
 XEN_BOOTLOADER = _autoconf.XEN_BOOTLOADER
 XEN_KERNEL = _autoconf.XEN_KERNEL
 XEN_INITRD = _autoconf.XEN_INITRD
-XEN_CMD = "xm"
+XEN_CMD_XM = "xm"
+XEN_CMD_XL = "xl"
+# FIXME: This will be made configurable using hvparams in Ganeti 2.7
+XEN_CMD = _autoconf.XEN_CMD
 
 KVM_PATH = _autoconf.KVM_PATH
 KVM_KERNEL = _autoconf.KVM_KERNEL
@@ -1694,6 +1698,8 @@ RSS_DESCRIPTION = {
 MAX_NICS = 8
 MAX_DISKS = 16
 
+# SSCONF file prefix
+SSCONF_FILEPREFIX = "ssconf_"
 # SSCONF keys
 SS_CLUSTER_NAME = "cluster_name"
 SS_CLUSTER_TAGS = "cluster_tags"