diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2016-11-14 11:09:31 -0500 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-11-15 11:30:26 -0800 |
| commit | 8437b24de36d322d26f707890f25392a098de30e (patch) | |
| tree | 27d8f9e6b7feb8d287ad3e98f722ce71ca856573 /extras/ganesha | |
| parent | a35d63050ec7e745a66c1aef8e1c8eb42d7b67a1 (diff) | |
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 <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/15843
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: soumya k <skoduri@redhat.com>
Diffstat (limited to 'extras/ganesha')
| -rw-r--r-- | extras/ganesha/scripts/ganesha-ha.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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) |