Skip to content

[release-4.18] OCPBUGS-48341: Specify interface type when adding ovs-port #4790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2025
+2 −2
Merged

[release-4.18] OCPBUGS-48341: Specify interface type when adding ovs-port #4790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/common/_base/files/configure-ovs-network.yaml
View file
Original file line number Diff line number Diff line change
@@ -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=()