From 4bc3fe695e52b81d19548bc65e7564edf814919f Mon Sep 17 00:00:00 2001 From: Meghana Madhusudhan Date: Mon, 15 Jun 2015 16:42:21 +0530 Subject: [PATCH 077/101] common-ha : Clean up cib state completely Clean up cluster state on all the machines during tear down. Change-Id: I71706d2a43cc2cfe3fdcb14443536f7fe84a54c9 BUG: 1227709 Signed-off-by: Meghana Madhusudhan Reviewed-on: https://code.engineering.redhat.com/gerrit/50760 Reviewed-by: Kaleb Keithley Reviewed-by: Soumya Koduri Tested-by: Soumya Koduri --- extras/ganesha/scripts/ganesha-ha.sh | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 40705e0..9d73cf9 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) -- 1.7.1