constants: Remove duplicate DRBD barrier option

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 6e23fac..e629175 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -140,7 +140,7 @@ ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE
 ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE
 ENABLE_CONFD = _autoconf.ENABLE_CONFD
 ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
-ENABLE_REMOTE_COMMANDS = _autoconf.ENABLE_REMOTE_COMMANDS
+ENABLE_RESTRICTED_COMMANDS = _autoconf.ENABLE_RESTRICTED_COMMANDS
 
 NODED = "ganeti-noded"
 CONFD = "ganeti-confd"
@@ -423,7 +423,6 @@ DRBD_VALID_BARRIER_OPT = frozenset([
   frozenset([DRBD_B_DISK_DRAIN]),
   frozenset([DRBD_B_DISK_FLUSH]),
   frozenset([DRBD_B_DISK_DRAIN, DRBD_B_DISK_FLUSH]),
-  frozenset([DRBD_B_DISK_DRAIN, DRBD_B_DISK_FLUSH]),
   frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_DRAIN]),
   frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH]),
   frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH, DRBD_B_DISK_DRAIN]),
@@ -1072,6 +1071,9 @@ NIC_IP_POOL = "pool"
 
 NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
 
+RESERVE_ACTION = "reserve"
+RELEASE_ACTION = "release"
+
 # An extra description of the network.
 # Can be used by hooks/kvm-vif-bridge to apply different rules
 NETWORK_TYPE_PRIVATE = "private"
@@ -2097,5 +2099,11 @@ SSH_DAEMON_KEYFILES = {
   SSHK_DSA: (pathutils.SSH_HOST_DSA_PRIV, pathutils.SSH_HOST_DSA_PUB),
   }
 
+# Node daemon setup
+NDS_CLUSTER_NAME = "cluster_name"
+NDS_NODE_DAEMON_CERTIFICATE = "node_daemon_certificate"
+NDS_SSCONF = "ssconf"
+NDS_START_NODE_DAEMON = "start_node_daemon"
+
 # Do not re-export imported modules
 del re, _vcsversion, _autoconf, socket, pathutils