constants: Remove duplicate DRBD barrier option

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 4f78766..e629175 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -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,8 +1071,8 @@ NIC_IP_POOL = "pool"
 
 NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
 
-RESERVE_ACTION = 'reserve'
-RELEASE_ACTION = 'release'
+RESERVE_ACTION = "reserve"
+RELEASE_ACTION = "release"
 
 # An extra description of the network.
 # Can be used by hooks/kvm-vif-bridge to apply different rules
@@ -2100,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