Convert AddOSToInstance to (status, data)

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 05bc01a..a483165 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -94,8 +94,10 @@ LOCK_DIR = _autoconf.LOCALSTATEDIR + "/lock"
 SSCONF_LOCK_FILE = LOCK_DIR + "/ganeti-ssconf.lock"
 CLUSTER_CONF_FILE = DATA_DIR + "/config.data"
 SSL_CERT_FILE = DATA_DIR + "/server.pem"
+RAPI_CERT_FILE = DATA_DIR + "/rapi.pem"
 WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
+RAPI_USERS_FILE = DATA_DIR + "/rapi_users"
 QUEUE_DIR = DATA_DIR + "/queue"
 ETC_HOSTS = "/etc/hosts"
 DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
@@ -131,6 +133,7 @@ XEN_KERNEL = _autoconf.XEN_KERNEL
 XEN_INITRD = _autoconf.XEN_INITRD
 
 KVM_PATH = _autoconf.KVM_PATH
+SOCAT_PATH = _autoconf.SOCAT_PATH
 
 VALUE_DEFAULT = "default"
 VALUE_AUTO = "auto"
@@ -190,9 +193,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'
@@ -232,13 +235,18 @@ 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,
+ RPC_ENCODING_ZLIB_BASE64) = range(2)
 
 # os related constants
 OS_VALID_STATUS = "VALID"
@@ -361,6 +369,8 @@ JOB_QUEUE_VERSION_FILE = QUEUE_DIR + "/version"
 JOB_QUEUE_SERIAL_FILE = QUEUE_DIR + "/serial"
 JOB_QUEUE_ARCHIVE_DIR = QUEUE_DIR + "/archive"
 JOB_QUEUE_DRAIN_FILE = QUEUE_DIR + "/drain"
+JOB_QUEUE_SIZE_HARD_LIMIT = 5000
+JOB_QUEUE_SIZE_SOFT_LIMIT = JOB_QUEUE_SIZE_HARD_LIMIT * 0.8
 
 JOB_ID_TEMPLATE = r"\d+"
 
@@ -392,7 +402,7 @@ ELOG_PROGRESS = "progress"
 RAPI_ENABLE = True
 RAPI_PORT = 5080
 
-# max dynamnic devices
+# max dynamic devices
 MAX_NICS = 8
 MAX_DISKS = 16
 
@@ -404,6 +414,8 @@ SS_MASTER_IP = "master_ip"
 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
@@ -423,7 +435,7 @@ HVC_DEFAULTS = {
         HV_PAE: True,
         },
     HT_KVM: {
-        HV_KERNEL_PATH: "/boot/vmlinuz-2.6-xenU",
+        HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU",
         HV_INITRD_PATH: None,
         HV_ACPI: True,
         },