X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/8d528b7cce3db73301cf3d82962cacbce492ad48..acec9d51f4aea4b4571fcee477bea935487b8b83:/lib/constants.py?ds=sidebyside

diff --git a/lib/constants.py b/lib/constants.py
index 896fc48..062d943 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -24,12 +24,27 @@
 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
 
+# 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"
@@ -42,7 +57,7 @@ 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 + "/master.sock"
+MASTER_SOCKET = RUN_DIR + "/ganeti-master.sock"
 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811
@@ -86,21 +101,17 @@ HKR_SUCCESS = 2
 # disk template types
 DT_DISKLESS = "diskless"
 DT_PLAIN = "plain"
-DT_LOCAL_RAID1 = "local_raid1"
-DT_REMOTE_RAID1 = "remote_raid1"
 DT_DRBD8 = "drbd"
 DT_FILE = "file"
 
 # 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"
-LD_MD_R1 = "md_raid1"
-LD_DRBD7 = "drbd"
 LD_DRBD8 = "drbd8"
 LD_FILE = "file"
 
@@ -109,7 +120,7 @@ FD_LOOP = "loop"
 FD_BLKTAP = "blktap"
 
 # 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"
@@ -121,7 +132,6 @@ INSTANCE_CREATE = "create"
 INSTANCE_IMPORT = "import"
 
 DISK_TEMPLATES = frozenset([DT_DISKLESS, DT_PLAIN,
-                            DT_LOCAL_RAID1, DT_REMOTE_RAID1,
                             DT_DRBD8, DT_FILE])
 
 FILE_DRIVER = frozenset([FD_LOOP, FD_BLKTAP])
@@ -150,6 +160,8 @@ 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"
@@ -179,6 +191,7 @@ 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"
+VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
 
 # Cluster Verify steps
 VERIFY_NPLUSONE_MEM = 'nplusone_mem'