From 16d298584c70138fd639281bc900838d7938aec9 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Wed, 22 Feb 2017 14:37:04 +0530 Subject: [PATCH 057/124] ganesha/scripts : Remove export entries from ganesha.conf during cleanup Label: DOWNSTREAM ONLY Change-Id: I288f7c9ced23d258a7ce1242d8efe03a4bf6f746 Signed-off-by: Jiffin Tony Thottan Reviewed-on: https://review.gluster.org/16708 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: soumya k Reviewed-by: Kaleb KEITHLEY Signed-off-by: Jiffin Tony Thottan Reviewed-on: https://code.engineering.redhat.com/gerrit/167142 Reviewed-by: Soumya Koduri Tested-by: RHGS Build Bot Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- extras/ganesha/scripts/ganesha-ha.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 4b93f95..7ba80b5 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -342,6 +342,7 @@ cleanup_ganesha_config () rm -f /etc/corosync/corosync.conf rm -rf /etc/cluster/cluster.conf* rm -rf /var/lib/pacemaker/cib/* + sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $HA_CONFDIR/ganesha.conf } do_create_virt_ip_constraints() -- 1.8.3.1