Add method to update a disk object size

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index de40522..062d943 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -24,12 +24,27 @@
 from ganeti import _autoconf
 
 # various versions
 from ganeti import _autoconf
 
 # various versions

-CONFIG_VERSION = 3
-PROTOCOL_VERSION = 11
+PROTOCOL_VERSION = 13

 RELEASE_VERSION = _autoconf.PACKAGE_VERSION
 OS_API_VERSION = 5
 EXPORT_VERSION = 0
 
 RELEASE_VERSION = _autoconf.PACKAGE_VERSION
 OS_API_VERSION = 5
 EXPORT_VERSION = 0
 

+# Format for CONFIG_VERSION:
+#   01 03 0123 = 01030123
+#   ^^ ^^ ^^^^
+#   |  |  + Configuration version/revision
+#   |  + Minor version
+#   + Major version
+#
+# It stored as an integer. Make sure not to write an octal number.
+#
+CONFIG_MAJOR = int(_autoconf.VERSION_MAJOR)
+CONFIG_MINOR = int(_autoconf.VERSION_MINOR)
+CONFIG_REVISION = 0
+CONFIG_VERSION = (
+  1000000 * CONFIG_MAJOR +
+    10000 * CONFIG_MINOR +
+        1 * CONFIG_REVISION)

 
 # file paths
 DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"
 
 # file paths
 DATA_DIR = _autoconf.LOCALSTATEDIR + "/lib/ganeti"

@@ -41,6 +56,8 @@ SSL_CERT_FILE = DATA_DIR + "/server.pem"
 WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 ETC_HOSTS = "/etc/hosts"
 WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 ETC_HOSTS = "/etc/hosts"

+DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
+MASTER_SOCKET = RUN_DIR + "/ganeti-master.sock"

 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811
 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811

@@ -52,6 +69,7 @@ LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti"
 LOG_OS_DIR = LOG_DIR + "/os"
 LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
 LOG_WATCHER = LOG_DIR + "/watcher.log"
 LOG_OS_DIR = LOG_DIR + "/os"
 LOG_NODESERVER = LOG_DIR + "/node-daemon.log"
 LOG_WATCHER = LOG_DIR + "/watcher.log"

+LOG_MASTERDAEMON = LOG_DIR + "/master-daemon.log"

 
 OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR
 
 OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
 EXPORT_DIR = _autoconf.EXPORT_DIR

@@ -83,34 +101,40 @@ HKR_SUCCESS = 2
 # disk template types
 DT_DISKLESS = "diskless"
 DT_PLAIN = "plain"
 # disk template types
 DT_DISKLESS = "diskless"
 DT_PLAIN = "plain"

-DT_LOCAL_RAID1 = "local_raid1"
-DT_REMOTE_RAID1 = "remote_raid1"

 DT_DRBD8 = "drbd"
 DT_DRBD8 = "drbd"

+DT_FILE = "file"

 
 # the set of network-mirrored disk templates
 
 # the set of network-mirrored disk templates

-DTS_NET_MIRROR = frozenset([DT_REMOTE_RAID1, DT_DRBD8])
+DTS_NET_MIRROR = frozenset([DT_DRBD8])
+
+# the set of non-lvm-based disk templates
+DTS_NOT_LVM = frozenset([DT_DISKLESS, DT_FILE])

 
 # logical disk types
 LD_LV = "lvm"
 
 # logical disk types
 LD_LV = "lvm"

-LD_MD_R1 = "md_raid1"
-LD_DRBD7 = "drbd"

 LD_DRBD8 = "drbd8"
 LD_DRBD8 = "drbd8"

+LD_FILE = "file"
+
+# file backend driver
+FD_LOOP = "loop"
+FD_BLKTAP = "blktap"

 
 # the set of drbd-like disk types
 
 # the set of drbd-like disk types

-LDS_DRBD = frozenset([LD_DRBD7, LD_DRBD8])
+LDS_DRBD = frozenset([LD_DRBD8])

 
 # disk replacement mode
 REPLACE_DISK_PRI = "replace_primary"
 REPLACE_DISK_SEC = "replace_secondary"
 REPLACE_DISK_ALL = "replace_all"
 
 
 # disk replacement mode
 REPLACE_DISK_PRI = "replace_primary"
 REPLACE_DISK_SEC = "replace_secondary"
 REPLACE_DISK_ALL = "replace_all"
 

-# instance creation modem
+# instance creation modes

 INSTANCE_CREATE = "create"
 INSTANCE_IMPORT = "import"
 
 DISK_TEMPLATES = frozenset([DT_DISKLESS, DT_PLAIN,
 INSTANCE_CREATE = "create"
 INSTANCE_IMPORT = "import"
 
 DISK_TEMPLATES = frozenset([DT_DISKLESS, DT_PLAIN,

-                            DT_LOCAL_RAID1, DT_REMOTE_RAID1,
-                            DT_DRBD8])
+                            DT_DRBD8, DT_FILE])
+
+FILE_DRIVER = frozenset([FD_LOOP, FD_BLKTAP])

 
 # import/export config options
 INISECT_EXP = "export"
 
 # import/export config options
 INISECT_EXP = "export"

@@ -135,6 +159,9 @@ SYNC_SPEED = 30 * 1024
 LOCALHOST_IP_ADDRESS = "127.0.0.1"
 TCP_PING_TIMEOUT = 10
 GANETI_RUNAS = "root"
 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

 
 # valid os status
 OS_VALID_STATUS = "VALID"
 
 # valid os status
 OS_VALID_STATUS = "VALID"

@@ -146,6 +173,8 @@ SSH_HOST_DSA_PRIV = SSH_CONFIG_DIR + "ssh_host_dsa_key"
 SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub"
 SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "ssh_host_rsa_key"
 SSH_HOST_RSA_PUB = SSH_HOST_RSA_PRIV + ".pub"
 SSH_HOST_DSA_PUB = SSH_HOST_DSA_PRIV + ".pub"
 SSH_HOST_RSA_PRIV = SSH_CONFIG_DIR + "ssh_host_rsa_key"
 SSH_HOST_RSA_PUB = SSH_HOST_RSA_PRIV + ".pub"

+SSH = "ssh"
+SCP = "scp"

 
 # reboot types
 INSTANCE_REBOOT_SOFT = "soft"
 
 # reboot types
 INSTANCE_REBOOT_SOFT = "soft"

@@ -162,3 +191,18 @@ HTS_REQ_PORT = frozenset([HT_XEN_HVM31])
 HT_HVM_VNC_BASE_PORT = 5900
 HT_HVM_DEFAULT_BOOT_ORDER = 'dc'
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
 HT_HVM_VNC_BASE_PORT = 5900
 HT_HVM_DEFAULT_BOOT_ORDER = 'dc'
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"

+VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
+
+# Cluster Verify steps
+VERIFY_NPLUSONE_MEM = 'nplusone_mem'
+VERIFY_OPTIONAL_CHECKS = frozenset([VERIFY_NPLUSONE_MEM])
+
+# Allocator framework constants
+IALLOCATOR_DIR_IN = "in"
+IALLOCATOR_DIR_OUT = "out"
+IALLOCATOR_MODE_ALLOC = "allocate"
+IALLOCATOR_MODE_RELOC = "relocate"
+IALLOCATOR_SEARCH_PATH = _autoconf.IALLOCATOR_SEARCH_PATH
+IARUN_NOTFOUND = 1
+IARUN_FAILURE = 2
+IARUN_SUCCESS = 3