Skip to content

Bug 2040671: Configure-ovs: Ensure DHCP finishes for both address families #2929

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
openshift-merge-robot merged 1 commit into from
Jan 26, 2022
Merged

Bug 2040671: Configure-ovs: Ensure DHCP finishes for both address families #2929

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
16 changes: 15 additions & 1 deletion templates/common/_base/files/configure-ovs-network.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,23 @@ contents:
nmcli c load ${new_conn_file}
echo "Loaded new $ovs_interface connection file: ${new_conn_file}"
else
extra_if_brex_args=""
# check if interface had ipv4/ipv6 addresses assigned
ipv4_addr=$(nmcli --get-values ip4.address conn show ${old_conn})
if [ -n "$ipv4_addr" ]; then
extra_if_brex_args+="ipv4.may-fail no "
fi

# IPV6 should have at least a link local address. Check for more than 1 to see if there is an
# assigned address.
num_ip6_addrs=$(nmcli -m multiline --get-values ip6.address conn show ${old_conn} | wc -l)
if [ "$num_ip6_addrs" -gt 1 ]; then
extra_if_brex_args+="ipv6.may-fail no "
fi

nmcli c add type ovs-interface slave-type ovs-port conn.interface "$bridge_name" master "$ovs_port" con-name \
"$ovs_interface" 802-3-ethernet.mtu ${iface_mtu} 802-3-ethernet.cloned-mac-address ${iface_mac} \
ipv4.route-metric "$BRIDGE_METRIC" ipv6.route-metric "$BRIDGE_METRIC"
ipv4.route-metric "$BRIDGE_METRIC" ipv6.route-metric "$BRIDGE_METRIC" ${extra_if_brex_args}
fi
fi

Expand Down