Remove old ovndbs update workaround
This is basically a revert ot I8f71bf83ddafca167deae1a38ca819f7d930fb80 https://bugzilla.redhat.com/show_bug.cgi?id=1759974 has now been fixed via https://bugzilla.redhat.com/show_bug.cgi?id=1760763: "[ovsdb-server] Allow replicating from older schema servers" which has been fixed in openvswitch2.11-2.11.0-35.el8fdp.x86_64 which was released on 2020-01-22. I think in master (and potentially wallaby) we can just remove this workaround now. Change-Id: I428a30d2ad7be295f8b3dbeaddd76eb88432a532
This commit is contained in:
parent
2a6f452a2c
commit
efd4ca0851
@ -269,23 +269,6 @@ outputs:
|
||||
- {get_param: CertificateKeySize}
|
||||
ca: ipa
|
||||
update_tasks:
|
||||
# When a schema change happens, the newer slaves don't connect
|
||||
# back to the older master and end up timing out. So we clean
|
||||
# up the error here until we get a fix for
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1759974
|
||||
- name: Clear ovndb cluster pacemaker error
|
||||
shell: "pcs resource cleanup ovn-dbs-bundle"
|
||||
when:
|
||||
- step|int == 0
|
||||
# Then we ban the resource for this node. It has no effect on
|
||||
# the first two controllers, but when we reach the last one,
|
||||
# it avoids a cut in the control plane as master get chosen in
|
||||
# one of the updated Stopped ovn. They are in error, that why
|
||||
# we need the cleanup just before.
|
||||
- name: Ban ovndb resource on the current node.
|
||||
shell: "pcs resource ban ovn-dbs-bundle $(hostname | cut -d. -f1)"
|
||||
when:
|
||||
- step|int == 0
|
||||
- name: Tear-down non-HA ovn-dbs containers
|
||||
when:
|
||||
- step|int == 1
|
||||
@ -327,15 +310,6 @@ outputs:
|
||||
vars:
|
||||
ovn_dbs_image: {get_param: ContainerOvnDbsImage}
|
||||
ovn_dbs_image_latest: *ovn_dbs_image_pcmklatest
|
||||
# We remove any leftover error and remove the ban.
|
||||
- name: Ensure the cluster converge back even in case of schema change
|
||||
shell: "pcs resource cleanup ovn-dbs-bundle"
|
||||
when:
|
||||
- step|int == 5
|
||||
- name: Remove the ban
|
||||
shell: "pcs resource clear ovn-dbs-bundle"
|
||||
when:
|
||||
- step|int == 5
|
||||
# When ovn-dbs-bundle support was added, we didn't tag the ovn-dbs image
|
||||
# with pcmklatest. So, when update is run for the first time we need to
|
||||
# update the ovn-dbs-bundle resource to use the 'pcmklatest' tagged image.
|
||||
|
Loading…
Reference in New Issue
Block a user