summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMeghana Madhusudhan <mmadhusu@redhat.com>2015-06-15 16:42:21 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-06-16 05:15:27 -0700
commit5dcf0170254e42811d756faa5cee610186300000 (patch)
tree4fe7c716ff0389264f6e33967d4a9df10dec81c6 /extras
parente88985e2e5959970f49cc135f9f00104d6e4dadc (diff)
common-ha : Clean up cib state completely
Clean up cluster state on all the machines during tear down. This is a backport of the patch merged upstream, http://review.gluster.org/#/c/11231/ Change-Id: I58d1b6ee743158bc0e5d1c965c0d5a137c9843e5 BUG: 1232155 Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com> Reviewed-on: http://review.gluster.org/11244 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/ganesha/scripts/ganesha-ha.sh23
1 files changed, 1 insertions, 22 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index bd344fa50f1..9d73cf93da0 100755
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -235,30 +235,10 @@ cleanup_ganesha_config ()
rm -rf ${HA_CONFDIR}/exports/*.conf
rm -rf ${HA_CONFDIR}/.export_added
rm -rf /etc/cluster/cluster.conf*
+ rm -rf /var/lib/pacemaker/cib/*
sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $CONF
}
-
-teardown_clean_etccluster()
-{
- local short_host=$(hostname -s)
-
- if [ -e /var/lib/glusterd/nfs/secret.pem ]; then
- while [[ ${1} ]]; do
- if [ ${short_host} != ${1} ]; then
- ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i /var/lib/glusterd/nfs/secret.pem ${1} rm -f /etc/cluster/cluster.*
- if [ $? -ne 0 ]; then
- logger "warning: ssh ${1} rm -f /etc/cluster/cluster.* failed"
- fi
- fi
- shift
- done
- else
- logger "warning: ssh ${1} rm -f /etc/cluster/cluster.* failed"
- fi
-}
-
-
do_create_virt_ip_constraints()
{
local cibfile=${1}; shift
@@ -782,7 +762,6 @@ main()
teardown_cluster ${HA_NAME}
- teardown_clean_etccluster ${HA_SERVERS}
;;
cleanup | --cleanup)