|
 |
cb8e9e |
From c07c6e01a4236b8a48474627572ff798b1837870 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Meghana Madhusudhan <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Date: Fri, 12 Jun 2015 12:19:16 +0530
|
|
|
cb8e9e |
Subject: [PATCH 074/101] common-ha : Clean up persistent cib state
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Pacemaker saves old configurations in the
|
|
|
cb8e9e |
directory, "/var/lib/pacemaker/cib". It's
|
|
|
cb8e9e |
good to clean up this directory during teardown so that
|
|
|
cb8e9e |
old data doesn't show up the next time.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: Ib2f52e17b37d8230706b4347511ae9fc13ff8d39
|
|
|
cb8e9e |
BUG: 1227709
|
|
|
cb8e9e |
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/50603
|
|
|
cb8e9e |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Tested-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
extras/ganesha/scripts/ganesha-ha.sh | 3 ++-
|
|
|
cb8e9e |
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
index bd344fa..40705e0 100755
|
|
|
cb8e9e |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
@@ -246,7 +246,8 @@ teardown_clean_etccluster()
|
|
|
cb8e9e |
if [ -e /var/lib/glusterd/nfs/secret.pem ]; then
|
|
|
cb8e9e |
while [[ ${1} ]]; do
|
|
|
cb8e9e |
if [ ${short_host} != ${1} ]; then
|
|
|
cb8e9e |
- ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i /var/lib/glusterd/nfs/secret.pem ${1} rm -f /etc/cluster/cluster.*
|
|
|
cb8e9e |
+ ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i /var/lib/glusterd/nfs/secret.pem ${1} \
|
|
|
cb8e9e |
+rm -f /etc/cluster/cluster.* rm -f /var/lib/pacemaker/cib/*
|
|
|
cb8e9e |
if [ $? -ne 0 ]; then
|
|
|
cb8e9e |
logger "warning: ssh ${1} rm -f /etc/cluster/cluster.* failed"
|
|
|
cb8e9e |
fi
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|