summaryrefslogtreecommitdiffstats
path: root/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-02 19:11:24 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-02 19:11:24 +0100
commitb1849f630a8de3dfce2e91fc375d9e901b90843b (patch)
tree48e09b8dc3ae680e92b38136363e920901d0d891 /mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
parentbb3a642e783b59ae2decb3b73d91f5bfca3afaef (diff)
[patch] Fix OVS ifup workaround
Do not assume routes are on the same OVS port as the one currently being configured. Instead, apply the `unless` ifup condition for any OVS port. Change-Id: Iea8084f9e50401d300feb7ed16f90b430680cac5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch')
-rw-r--r--mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch17
1 files changed, 12 insertions, 5 deletions
diff --git a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
index c36631aea..49b2b88cc 100644
--- a/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
+++ b/mcp/patches/0007-network.interface-Fix-ifup-OVS-port-with-route.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 31 Dec 2017 16:06:30 +0100
Subject: [PATCH] network.interface: Fix ifup OVS port with route
@@ -13,20 +21,19 @@ the OVS port in UP state, so `ifup` would fail.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- linux/network/interface.sls | 4 ++++
- 1 file changed, 4 insertions(+)
+ linux/network/interface.sls | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
+index 921ceac..3bba64e 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
-@@ -146,6 +146,10 @@ ovs_port_up_{{ interface_name }}:
+@@ -146,6 +146,8 @@ ovs_port_up_{{ interface_name }}:
- file: ovs_port_{{ interface_name }}_line2
- openvswitch_bridge: ovs_bridge_{{ interface.bridge }}
- file: linux_interfaces_final_include
-+ {%- if interface.route is defined %}
+ - unless:
+ - ip link show {{ interface_name }} | grep -q '\<UP\>'
-+ {% endif %}
{%- endif %}