summaryrefslogtreecommitdiffstats
path: root/extras/ganesha
diff options
context:
space:
mode:
authorMeghana Madhusudhan <mmadhusu@redhat.com>2015-06-15 16:42:21 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-06-15 08:06:55 -0700
commit5cdbbf34e31758071f597561aa8572cedd56aece (patch)
treea7da65b44007239871f00fc0506ce1623f3b01cb /extras/ganesha
parent8e5fa4d025492762db566634b7493148a92f6d05 (diff)
common-ha : Clean up cib state completely
Clean up cluster state on all the machines during tear down. Change-Id: If9ca65b6ca8790ac97311f33359e28558e90c557 BUG: 1228415 Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com> Reviewed-on: http://review.gluster.org/11231 Reviewed-by: soumya k <skoduri@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras/ganesha')
-rwxr-xr-xextras/ganesha/scripts/ganesha-ha.sh24
1 files changed, 1 insertions, 23 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 684b8bf679d..9d73cf93da0 100755
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -235,31 +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.* rm -f /var/lib/pacemaker/cib/*
- 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
@@ -783,7 +762,6 @@ main()
teardown_cluster ${HA_NAME}
- teardown_clean_etccluster ${HA_SERVERS}
;;
cleanup | --cleanup)