Skip to content

OCPBUGS-54682: Fix - NetworkManager restart or crash renders br-ex unusable #5304

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 5 commits into from
Oct 15, 2025
Merged

OCPBUGS-54682: Fix - NetworkManager restart or crash renders br-ex unusable #5304

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a59b6c
ofport-request dispatcher script takes br-ex(-br) managed by nmstate …
emy Sep 24, 2025
28a1a75
improve of-port request so it uses a common path instead of retrying …
emy Sep 30, 2025
5add825
Revert "improve of-port request so it uses a common path instead of r…
emy Oct 9, 2025
1e8fc02
Revert "ofport-request dispatcher script takes br-ex(-br) managed by …
emy Oct 9, 2025
0a6dfa5
add: fallback check for br-ex-br in ofport NM dispatcher script
emy Oct 9, 2025
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/ofport-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ contents:
fi

# Get the port's master. If it doesn't have any, assume it's not our bridge
BRIDGE_ID=$(nmcli -t -f connection.master conn show "${PORT_CONNECTION_UUID}" | awk -F ':' '{print $NF}')
BRIDGE_ID=$(nmcli -t -f general.name conn show "${PORT_CONNECTION_UUID}" | awk -F ':' '{print $NF}')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change changes the logic

[root@worker-1 ~]# nmcli -t -f general.name conn show "${PORT_CONNECTION_UUID}" | awk -F ':' '{print $NF}'
ovs-port-phys0
[root@worker-1 ~]# nmcli -t -f connection.master conn show "${PORT_CONNECTION_UUID}" | awk -F ':' '{print $NF}'
br-ex

if [ "${BRIDGE_ID}" == "" ]; then
exit 0
fi

# Get the bridge name
BRIDGE_NAME=$(nmcli -t -f connection.interface-name conn show "${BRIDGE_ID}" | awk -F ':' '{print $NF}')
BRIDGE_NAME=$(nmcli -t -f connection.master conn show "${BRIDGE_ID}" | awk -F ':' '{print $NF}') || true
# Limit this to br-ex and br-ex1 only. If one wanted to enable this for all OVS bridges,
# the condition would be: if [ "$BRIDGE_NAME" == "" ]; then
if [ "${BRIDGE_NAME}" != "br-ex" ] && [ "${BRIDGE_NAME}" != "br-ex1" ]; then
Expand Down