From 0255a199e132ca0364f4719fcec26622d7c19d67 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 25 Aug 2018 04:14:40 +0200 Subject: [PATCH] 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 --- .../salt-formula-linux/0002-Set-ovs-bridges-as-L3-interfaces.patch | 4 ++-- .../classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 | 1 + .../classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 | 1 + mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 1 + mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 | 1 + 5 files changed, 6 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 }} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 index 51a6dbd68..50de921ac 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 @@ -66,6 +66,7 @@ parameters: - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true ovs_port_{{ nm.cmp001.nic_public }}: enabled: true name: {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 index 72c381070..ed5fb72ad 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -58,6 +58,7 @@ parameters: - {{ ma.interface_str(nm.ctl01.nic_public, nm.vlan_public) }} gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true br-mgmt: enabled: true type: bridge diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 index bde5e7ac1..fc064c183 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -71,3 +71,4 @@ parameters: - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 index ac3555604..c7c9787f8 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 @@ -47,3 +47,4 @@ parameters: - {{ ma.interface_str(nm.cmp001.nic_public, nm.vlan_public) }} gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true -- 2.16.6