From 8d8b97be16ac73bfb2eb43a3ebc0a18f8d1a55c0 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Mon, 16 Dec 2024 12:54:32 -0600 Subject: [PATCH] OCPBUGS-41489: Specify interface type when adding ovs-port We already do this in a few other places, but not on these two calls. Under some circumstances, this is causing ovs-configuration to fail until manual intervention is done. --- templates/common/_base/files/configure-ovs-network.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/common/_base/files/configure-ovs-network.yaml b/templates/common/_base/files/configure-ovs-network.yaml index ff924592aa..ab5be62c77 100644 --- a/templates/common/_base/files/configure-ovs-network.yaml +++ b/templates/common/_base/files/configure-ovs-network.yaml @@ -219,13 +219,13 @@ contents: # find default port to add to bridge if ! nmcli connection show "$default_port_name" &> /dev/null; then ovs-vsctl --timeout=30 --if-exists del-port "$bridge_name" ${iface} - add_nm_conn "$default_port_name" type ovs-port conn.interface ${iface} master "$bridge_name" \ + add_nm_conn "$default_port_name" type ovs-port conn.interface ${iface} master "$bridge_name" slave-type ovs-bridge \ connection.autoconnect-slaves 1 fi if ! nmcli connection show "$ovs_port" &> /dev/null; then ovs-vsctl --timeout=30 --if-exists del-port "$bridge_name" "$bridge_name" - add_nm_conn "$ovs_port" type ovs-port conn.interface "$bridge_name" master "$bridge_name" + add_nm_conn "$ovs_port" type ovs-port conn.interface "$bridge_name" master "$bridge_name" slave-type ovs-bridge fi extra_phys_args=()