From 8437b24de36d322d26f707890f25392a098de30e Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 14 Nov 2016 11:09:31 -0500 Subject: common-ha: remove /etc/corosync/corosync.conf in teardown/cleanup In newer versions of corosync we observe that after tearing down an existing HA cluster, when trying to set up a new cluster, `pcs cluster start --all` will fail if corosync believes the nodes are already in the cluster based on the presence of, and the contents of /etc/corosync/corosync.conf So we summarily delete it. (An alternative/work-around is to use `pcs cluster start --force --all`) Change-Id: I225f4e35e3b605e860ec4f9537c40ed94ac68625 BUG: 1394881 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/15843 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: soumya k --- extras/ganesha/scripts/ganesha-ha.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'extras/ganesha/scripts/ganesha-ha.sh') diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index b5172dc032b..55a019e6b33 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -327,8 +327,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() @@ -833,6 +834,8 @@ main() teardown_resources ${HA_SERVERS} teardown_cluster ${HA_NAME} + + cleanup_ganesha_config ${HA_CONFDIR} ;; cleanup | --cleanup) -- cgit