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>
This commit is contained in:
parent
8e5fa4d025
commit
5cdbbf34e3
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user