Skip to content

Commit 6cabdc1

Browse files
Merge pull request #5118 from openshift-cherrypick-robot/cherry-pick-4609-to-release-4.18
[release-4.18] OCPBUGS-57357: Race in configure-ovs.sh affects bonding interface configuration.
2 parents f8096ce + 22ed277 commit 6cabdc1

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

templates/common/_base/files/configure-ovs-network.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,13 @@ contents:
576576
fi
577577
fi
578578
579+
# slaves should implicitly activate, give them a chance to do so
580+
if $is_slave; then
581+
if ! timeout 5 bash -c "while ! nmcli -g GENERAL.STATE conn show "$conn" | grep activated; do sleep 1; done"; then
582+
echo "WARNING: slave $conn did not implicitly activate in 5s, activating explicitly."
583+
fi
584+
fi
585+
579586
# Do not activate interfaces that are already active
580587
# But set the entry in master_interfaces to true if this is a slave
581588
# Also set autoconnect to yes

0 commit comments

Comments
 (0)