Skip to content
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

Jump to bottom

Bug 1867392: Fixes multiple NICs OVN/OVS config #1999

Merged
merged 1 commit into from
Aug 12, 2020
Merged

Bug 1867392: Fixes multiple NICs OVN/OVS config #1999

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 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 @@ -77,13 +77,15 @@ contents:
fi

# bring down any old iface
nmcli conn down $old_conn
nmcli device disconnect $iface

if ! nmcli connection show ovs-if-phys0 &> /dev/null; then
nmcli c add type 802-3-ethernet conn.interface ${iface} master ovs-port-phys0 con-name ovs-if-phys0 \
connection.autoconnect-priority 100 802-3-ethernet.mtu ${iface_mtu}
fi

nmcli conn up ovs-if-phys0

if ! nmcli connection show ovs-if-br-ex &> /dev/null; then
nmcli c add type ovs-interface slave-type ovs-port conn.interface br-ex master ovs-port-br-ex con-name \
ovs-if-br-ex 802-3-ethernet.mtu ${iface_mtu} 802-3-ethernet.cloned-mac-address ${iface_mac}
Expand Down
3 changes: 2 additions & 1 deletion templates/common/_base/units/ovs-configuration.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ contents: |
[Unit]
Description=Configures OVS with proper host networking configuration
# This service is used to move a physical NIC into OVS and reconfigure OVS to use the host IP
Requires=NetworkManager-wait-online.service openvswitch.service
Requires=openvswitch.service
Wants=NetworkManager-wait-online.service
After=NetworkManager-wait-online.service openvswitch.service node-valid-hostname.service
Before=network-online.target kubelet.service crio.service

Expand Down