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

[release-4.7] Bug 1927405: Fixes ovs-configuration with cloned connections #2418

Merged
merged 1 commit into from
Mar 5, 2021
Merged

[release-4.7] Bug 1927405: Fixes ovs-configuration with cloned connections #2418

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
8 changes: 6 additions & 2 deletions 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 @@ -43,8 +43,11 @@ contents:
ifconfig "$intf" allmulti
fi
}

NM_CONN_PATH="/etc/NetworkManager/system-connections"
if [ -d "/etc/NetworkManager/system-connections-merged" ]; then
NM_CONN_PATH="/etc/NetworkManager/system-connections-merged"
else
NM_CONN_PATH="/etc/NetworkManager/system-connections"
fi
iface=""
counter=0
# find default interface
Expand Down Expand Up @@ -196,6 +199,7 @@ contents:
echo "WARN: existing br-ex interface file found: $new_conn_file, which is not loaded in NetworkManager...overwriting"
fi
cp -f ${old_conn_file} ${new_conn_file}
restorecon ${new_conn_file}
if $cloned; then
nmcli conn delete ${old_conn}-clone
rm -f ${old_conn_file}
Expand Down