From e16878c8f46dc6bcabb8be8c7e909579f13bc11d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 16 Jun 2018 00:19:40 +0200 Subject: [PATCH 1/1] [patch] OVS bridges should not use 'auto' Change-Id: I0db7b9ee5af77f9e2d580c4ace9fa7d7f17c8d85 Signed-off-by: Alexandru Avadanii --- mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | 7 +++++-- 1 file 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 %} -- 2.16.6