Merge pull request #2402 from trozet/fix_ovs_config_nm_clone

Bug 1927366: Fixes ovs-configuration with cloned connections
openshift · Feb 17, 2021 · 61a1377 · 61a1377
2 parents 5ec5819 + f99c1bb
commit 61a1377
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/templates/common/_base/files/configure-ovs-network.yaml b/templates/common/_base/files/configure-ovs-network.yaml
@@ -43,8 +43,11 @@ contents:
           ifconfig "$intf" allmulti
         fi
       }
-
-      NM_CONN_PATH="/etc/NetworkManager/system-connections"
+      if [ -d "/etc/NetworkManager/system-connections-merged" ]; then
+        NM_CONN_PATH="/etc/NetworkManager/system-connections-merged"
+      else
+        NM_CONN_PATH="/etc/NetworkManager/system-connections"
+      fi
       iface=""
       counter=0
       # find default interface
@@ -196,6 +199,7 @@ contents:
             echo "WARN: existing br-ex interface file found: $new_conn_file, which is not loaded in NetworkManager...overwriting"
           fi
           cp -f ${old_conn_file} ${new_conn_file}
+          restorecon ${new_conn_file}
           if $cloned; then
             nmcli conn delete ${old_conn}-clone
             rm -f ${old_conn_file}