File 0005-Don-t-configure-no-quorum-policy-ignore-ev... of Package ha-cluster-bootstrap.2765

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Don-t-configure-no-quorum-policy-ignore-ever-bsc-981.patch of Package ha-cluster-bootstrap.2765

From 150e0614205a431ff0bae056a0776f7593f48296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Wed, 25 May 2016 10:41:09 +0200
Subject: [PATCH 5/7] Don't configure no-quorum-policy=ignore, ever
 (bsc#981056)

---
 scripts/ha-cluster-init | 1 -
 scripts/ha-cluster-join | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init
index b2bafd7..d9895d0 100755
--- a/scripts/ha-cluster-init
+++ b/scripts/ha-cluster-init
@@ -602,7 +602,6 @@ init_cluster()
 	cat > $tmp_conf <<END
 property \$id="cib-bootstrap-options" \\
 	stonith-enabled="false" \\
-	no-quorum-policy="ignore" \\
 	placement-strategy="balanced"
 op_defaults \$id="op-options" \\
 	timeout="600" \\
diff --git a/scripts/ha-cluster-join b/scripts/ha-cluster-join
index 3046192..1ec40b8 100755
--- a/scripts/ha-cluster-join
+++ b/scripts/ha-cluster-join
@@ -227,8 +227,8 @@ join_cluster()
         # Trigger corosync config reload to ensure expected_votes is propagated
 	invoke corosync-cfgtool -R
 
-	# Ditch no-quorum-policy=ignore if we're going over two nodes
-	if [ $(crm_node -l | sed '/^$/d' | wc -l) -gt 2 ] && crm configure show | grep -q 'no-quorum-policy=.*ignore' ; then
+	# Ditch no-quorum-policy=ignore
+	if crm configure show | grep -q 'no-quorum-policy=.*ignore' ; then
 		invoke crm_attribute --attr-name no-quorum-policy --delete-attr
 	fi
 }
-- 
2.8.3

Places

File 0005-Don-t-configure-no-quorum-policy-ignore-ever-bsc-981.patch of Package ha-cluster-bootstrap.2765

Places