aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-linux
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-25 04:14:40 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 17:04:16 +0200
commit0255a199e132ca0364f4719fcec26622d7c19d67 (patch)
treecf4dec6868072d20cb8bda70477f78285e03b04f /mcp/patches/salt-formula-linux
parentb0a8b088bcf73302b5fa4d30c8fad6a1612938d5 (diff)
Add noifupdown for all br-floating
Since we reboot all nodes, applying the network configuration via Salt before reboot is pointless and creates a race condition with OVS. While at it, add `--ignore-errors` to ifup call for OVS bridge to prevent a race condition during linux.network state apply. Change-Id: I22fe0afaffecd7b850a6b77d7b810ed296bfc9ca Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/salt-formula-linux')
-rw-r--r--mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch b/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
index ee82474b1..5bc397586 100644
--- a/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
+++ b/mcp/patches/salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch
@@ -61,7 +61,7 @@ index 222ca8e..03072cd 100644
mtu {{ port.get('mtu', '1500') }}
ovs_bridge {{ port.bridge }}
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
-index c2d2a23..01131fa 100644
+index c2d2a23..7efdc80 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}:
@@ -88,7 +88,7 @@ index c2d2a23..01131fa 100644
+
+ovs_bridge_up_{{ interface_name }}:
+ cmd.run:
-+ - name: ifup {{ interface_name }}
++ - name: ifup --ignore-errors {{ interface_name }}
+ - require:
+ - file: ovs_bridge_{{ interface_name }}
+ - openvswitch_bridge: ovs_bridge_{{ interface_name }}