From 5dcf0170254e42811d756faa5cee610186300000 Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Mon, 15 Jun 2015 16:42:21 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/11244 Reviewed-by: Kaleb KEITHLEY Reviewed-by: soumya k Tested-by: Gluster Build System --- extras/ganesha/scripts/ganesha-ha.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'extras/ganesha') 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) -- cgit