From c07c6e01a4236b8a48474627572ff798b1837870 Mon Sep 17 00:00:00 2001
From: Meghana Madhusudhan <mmadhusu@redhat.com>
Date: Fri, 12 Jun 2015 12:19:16 +0530
Subject: [PATCH 074/101] common-ha : Clean up persistent cib state

Pacemaker saves old configurations in the
directory, "/var/lib/pacemaker/cib". It's
good to clean up this directory during teardown so that
old data doesn't show up the next time.

Change-Id: Ib2f52e17b37d8230706b4347511ae9fc13ff8d39
BUG: 1227709
Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/50603
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Niels de Vos <ndevos@redhat.com>
---
 extras/ganesha/scripts/ganesha-ha.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index bd344fa..40705e0 100755
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -246,7 +246,8 @@ teardown_clean_etccluster()
     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.*
+		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
-- 
1.7.1