diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-18 14:35:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-18 14:35:19 +0000 |
| commit | 3dbd313cc111455f8cf88d0d072ec8a2f3c6f705 (patch) | |
| tree | 0377dfe7602d55c63166814d9169d90ce6068256 | |
| parent | bc70493008a9194ec215214c97175d870eadcbf8 (diff) | |
| parent | e16878c8f46dc6bcabb8be8c7e909579f13bc11d (diff) | |
Merge "[patch] OVS bridges should not use 'auto'"
| -rw-r--r-- | mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch index c55a3727c..d840e9f80 100644 --- a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch @@ -35,8 +35,11 @@ diff --git a/linux/files/ovs_port b/linux/files/ovs_port index 222ca8e..efb0307 100644 --- a/linux/files/ovs_port +++ b/linux/files/ovs_port -@@ -1,6 +1,9 @@ - auto {{ port_name }} +@@ -1,6 +1,11 @@ ++# With systemd, adding OVS bridges as 'auto' can cause race conditions ++# https://github.com/openvswitch/ovs/blob/master/debian/openvswitch-switch.README.Debian ++# auto {{ port_name }} +-auto {{ port_name }} allow-{{ port.bridge }} {{ port_name }} iface {{ port_name }} inet {{ port.get('proto', 'manual') }} +{%- if '.' in port_name %} |