From 9db5fbaff8e92b5df47d3424b76257897cf074cc Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 17 Nov 2016 06:42:13 -0500 Subject: [PATCH 169/206] nfs-ganesha (common-ha): remove /etc/corosysnc/corosync.conf in teardown fix for failure to enable ganesha after disable upstream BZs 1394881 (master), 1394882 (3.9), 1394883 (3.8) upstream Change-Id: I225f4e35e3b605e860ec4f9537c40ed94ac68625 upstream change (master): http://review.gluster.org/15843 upstream change (3.9): http://review.gluster.org/15844 upstream change (3.8): http://review.gluster.org/15845 Change-Id: I34edc1aeec162ba92d29d9f330f0591923dc5eee BUG: 1392895 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: https://code.engineering.redhat.com/gerrit/90451 Reviewed-by: Soumya Koduri Tested-by: Atin Mukherjee --- extras/ganesha/scripts/ganesha-ha.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 5162eb5..45d9e56 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -352,8 +352,9 @@ teardown_cluster() cleanup_ganesha_config () { - rm -rf /etc/cluster/cluster.conf* - rm -rf /var/lib/pacemaker/cib/* + rm -f /etc/corosync/corosync.conf + rm -rf /etc/cluster/cluster.conf* + rm -rf /var/lib/pacemaker/cib/* } do_create_virt_ip_constraints() @@ -858,6 +859,8 @@ main() teardown_resources ${HA_SERVERS} teardown_cluster ${HA_NAME} + + cleanup_ganesha_config ${HA_CONFDIR} ;; cleanup | --cleanup) -- 2.9.3