e7a346
From bfad2cafc9cbb58161386ee71dd086f01176558e Mon Sep 17 00:00:00 2001
e7a346
From: Jiffin Tony Thottan <jthottan@redhat.com>
e7a346
Date: Wed, 22 Feb 2017 14:37:04 +0530
e7a346
Subject: [PATCH 53/74] ganesha/scripts : Remove export entries from
e7a346
 ganesha.conf during cleanup
e7a346
e7a346
Change-Id: I288f7c9ced23d258a7ce1242d8efe03a4bf6f746
e7a346
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
e7a346
Reviewed-on: https://review.gluster.org/16708
e7a346
Smoke: Gluster Build System <jenkins@build.gluster.org>
e7a346
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
e7a346
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
e7a346
Reviewed-by: soumya k <skoduri@redhat.com>
e7a346
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
e7a346
---
e7a346
 extras/ganesha/scripts/ganesha-ha.sh | 1 +
e7a346
 1 file changed, 1 insertion(+)
e7a346
e7a346
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
e7a346
index d4844e4..2d6b06f 100644
e7a346
--- a/extras/ganesha/scripts/ganesha-ha.sh
e7a346
+++ b/extras/ganesha/scripts/ganesha-ha.sh
e7a346
@@ -342,6 +342,7 @@ cleanup_ganesha_config ()
e7a346
     rm -f /etc/corosync/corosync.conf
e7a346
     rm -rf /etc/cluster/cluster.conf*
e7a346
     rm -rf /var/lib/pacemaker/cib/*
e7a346
+    sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d'  $HA_CONFDIR/ganesha.conf
e7a346
 }
e7a346
 
e7a346
 do_create_virt_ip_constraints()
e7a346
-- 
e7a346
1.8.3.1
e7a346