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