summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)