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 from mainline
> http://review.gluster.org/#/c/14404/
> BUG: 1336945
> Change-Id: I86953fdd67e6736294dbd2d0795611837188bd9d

Change-Id: I402992bcb90a92dbcc915a75fe03b25221625e98
BUG: 1336947
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14405
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>

1 files changed, 5 insertions, 7 deletions

diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index a712b270033..62ee96fac78 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
-
 }