summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-05-17 17:40:36 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-05-19 03:17:30 -0700
commit4aa4eee079487061b620393e5058a84021259ad7 (patch)
tree5c24997e3f759ed6f78eca9c10fdf1c385d0ec9e /extras
parent70192bfe5f7f956843d094ec9cb484b23ce45556 (diff)
common-ha: stonith-enabled option set error in new pacemaker
Setting the option too early results in an error in newer versions of pacemaker. Postpone setting the option in order for it to succeed. N.B. We do not use a fencing agent. Yes, we know this is "not supported." Backport of mainline >> http://review.gluster.org/#/c/14404/ >> BUG: 1336945 >> Change-Id: I86953fdd67e6736294dbd2d0795611837188bd9d release-3.8 > http://review.gluster.org/#/c/14405/ > BUG: 1336947 > Change-Id: I402992bcb90a92dbcc915a75fe03b25221625e98 Change-Id: I6f75a4d67618b41a4b30c341f5b7e9ea976b553e BUG: 1336948 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14406 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/ganesha/scripts/ganesha-ha.sh12
1 files changed, 5 insertions, 7 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 33affe9..e91fe37 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -196,10 +196,6 @@ setup_cluster()
logger "warning: pcs property set no-quorum-policy=ignore failed"
fi
fi
- pcs property set stonith-enabled=false
- if [ $? -ne 0 ]; then
- logger "warning: pcs property set stonith-enabled=false failed"
- fi
}
@@ -208,14 +204,16 @@ setup_finalize_ha()
local cibfile=${1}
local stopped=""
+ pcs property set stonith-enabled=false
+ if [ $? -ne 0 ]; then
+ logger "warning: pcs property set stonith-enabled=false failed"
+ fi
+
stopped=$(pcs status | grep -u "Stopped")
while [[ "${stopped}X" = "StoppedX" ]]; do
sleep 1
stopped=$(pcs status | grep -u "Stopped")
done
-
- # pcs resource cleanup
-
}