Merge pull request #769 from trozet/revert-748-reset-timer

Bug 1874242: Revert "Bug 1857387: Do not reset the election-timer value"
openshift · Sep 1, 2020 · 3179c1a · 3179c1a
2 parents cd8915f + 2b785b0
commit 3179c1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bindata/network/ovn-kubernetes/ovnkube-master.yaml b/bindata/network/ovn-kubernetes/ovnkube-master.yaml
@@ -218,7 +218,7 @@ spec:
                   fi
                 done
 
-                if [[ ${election_timer} -lt ${current_election_timer} ]]; then
+                if [[ ${election_timer} -ne ${current_election_timer} ]]; then
                   retries=0
                   while is_candidate=$(ovs-appctl -t /var/run/ovn/ovnnb_db.ctl cluster/status OVN_Northbound 2>/dev/null \
                     | grep "Role: candidate" ); do
@@ -396,7 +396,7 @@ spec:
                   fi
                 done
 
-                if [[ ${election_timer} -lt ${current_election_timer} ]]; then
+                if [[ ${election_timer} -ne ${current_election_timer} ]]; then
                   retries=0
                   while is_candidate=$(ovs-appctl -t /var/run/ovn/ovnsb_db.ctl cluster/status OVN_Southbound 2>/dev/null \
                     | grep "Role: candidate" ); do