|
 |
21ab4e |
From 45f5d848f5216f4ef8e4bcc4309cbe804c8b8526 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Date: Wed, 22 Feb 2017 14:37:04 +0530
|
|
|
21ab4e |
Subject: [PATCH 401/406] ganesha/scripts : Remove export entries from
|
|
|
21ab4e |
ganesha.conf during cleanup
|
|
|
21ab4e |
|
|
|
21ab4e |
Upstream reference :
|
|
|
21ab4e |
>Change-Id: I288f7c9ced23d258a7ce1242d8efe03a4bf6f746
|
|
|
21ab4e |
>BUG: 1425726
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/16708
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
21ab4e |
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I288f7c9ced23d258a7ce1242d8efe03a4bf6f746
|
|
|
21ab4e |
BUG: 1426523
|
|
|
21ab4e |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/104154
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
extras/ganesha/scripts/ganesha-ha.sh | 1 +
|
|
|
21ab4e |
1 file changed, 1 insertion(+)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
index 0a15f1f..473c628 100644
|
|
|
21ab4e |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
21ab4e |
@@ -323,6 +323,7 @@ cleanup_ganesha_config ()
|
|
|
21ab4e |
rm -f /etc/corosync/corosync.conf
|
|
|
21ab4e |
rm -rf /etc/cluster/cluster.conf*
|
|
|
21ab4e |
rm -rf /var/lib/pacemaker/cib/*
|
|
|
21ab4e |
+ sed -r -i -e '/^%include[[:space:]]+".+\.conf"$/d' $HA_CONFDIR/ganesha.conf
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
do_create_virt_ip_constraints()
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|