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

fix linux bridge cleanup #187

Merged
merged 2 commits into from
Sep 30, 2019
Merged

fix linux bridge cleanup #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04630dd
fix linux bridge cleanup
phoracek Sep 27, 2019
aacce1e
Merge branch 'master' into fix_nmstate_bridge_cleanup
qinqon Sep 30, 2019
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
2 changes: 2 additions & 0 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ RUN sudo dnf install -y nmstate iproute && \
# TODO: Delete this line after we update nmstate to include the change
# https://github.com/nmstate/nmstate/commit/a4baaff50fef84d6d326977ff647bece1e917a26
RUN sed -i "s/run(timeout=20/run(timeout=60/g" /usr/lib/python3.7/site-packages/libnmstate/netapplier.py
# TODO: Delete this line after nmstate fixes https://github.com/nmstate/nmstate/issues/516
RUN sed -i "s/nmclient.NM.DeviceType.OVS_INTERFACE,/nmclient.NM.DeviceType.OVS_INTERFACE, nmclient.NM.DeviceType.BRIDGE,/" /usr/lib/python3.7/site-packages/libnmstate/nm/applier.py

# Cannot change the binary to nmstate-handler since the name
# is taken from the directory name [1]
Expand Down