From a6773f6167927958b187630cdd3f06f0f34403aa Mon Sep 17 00:00:00 2001 From: David J Wilder Date: Mon, 9 Dec 2024 10:01:32 -0800 Subject: [PATCH] Revert "Race in configure-ovs.sh affects bonding interface configuration." This reverts commit 50817d16b4ef2d3287b7e5fefe1340aef75f5733. --- templates/common/_base/files/configure-ovs-network.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/_base/files/configure-ovs-network.yaml b/templates/common/_base/files/configure-ovs-network.yaml index 3d3f369c57..ff924592aa 100644 --- a/templates/common/_base/files/configure-ovs-network.yaml +++ b/templates/common/_base/files/configure-ovs-network.yaml @@ -573,7 +573,7 @@ contents: # But set the entry in master_interfaces to true if this is a slave # Also set autoconnect to yes local active_state=$(nmcli -g GENERAL.STATE conn show "$conn") - if [ "$active_state" == "activated" ] || [ "$active_state" == "activating" ]; then + if [ "$active_state" == "activated" ]; then echo "Connection $conn already activated" if $is_slave; then master_interfaces[$master_interface]=true