Convert AddOSToInstance to (status, data)

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 84e7b59..a483165 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -193,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'
@@ -235,13 +235,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,
@@ -401,7 +402,7 @@ ELOG_PROGRESS = "progress"
 RAPI_ENABLE = True
 RAPI_PORT = 5080
 
-# max dynamnic devices
+# max dynamic devices
 MAX_NICS = 8
 MAX_DISKS = 16
 
@@ -414,6 +415,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