diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-04-03 19:24:12 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-04-23 10:53:47 +0000 |
| commit | 270720d0a7a040424c9cf8ff000d5262cfa60d29 (patch) | |
| tree | f37d5af0d1a00a689e08be8e7f297f7671e4c681 | |
| parent | 8f97ead1ee10e6580f42de0e42412edcb4d91168 (diff) | |
Add ports to ovs bridge config
To avoid race with interfaces initialization specify all
the ports that belong to a bridge in the config file.
Change-Id: Ie4f48e7a81d4659a0f43749cdd518dbeffe2e35f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 9c9a1adc6f2501507a68b1926ea93efcb40782d1)
| -rw-r--r-- | mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | 9 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 2 |
2 files changed, 8 insertions, 3 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 86c1d510d..c55a3727c 100644 --- a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch @@ -14,10 +14,10 @@ Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499 diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge new file mode 100644 -index 0000000..216581f +index 0000000..c609e45 --- /dev/null +++ b/linux/files/ovs_bridge -@@ -0,0 +1,10 @@ +@@ -0,0 +1,13 @@ +auto {{ bridge_name }} +allow-ovs {{ bridge_name }} +iface {{ bridge_name }} inet static @@ -25,6 +25,9 @@ index 0000000..216581f + address {{ bridge.address }} + netmask {{ bridge.netmask }} + mtu {{ bridge.get('mtu', '1500') }} ++ {%- if bridge.use_interfaces is defined %} ++ ovs_ports {{ bridge.use_interfaces|join(' ') }} ++ {%- endif %} + {%- if bridge.datapath_type is defined %} + ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }} + {%- endif %} @@ -43,7 +46,7 @@ index 222ca8e..efb0307 100644 mtu {{ port.get('mtu', '1500') }} ovs_bridge {{ port.bridge }} diff --git a/linux/network/interface.sls b/linux/network/interface.sls -index fa37e5e..b5ed1ae 100644 +index 180f912..dcb295b 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 }}: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index 412ca4811..998253c8f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -80,6 +80,8 @@ parameters: proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - {{ nm.cmp001.nic_public }}{% if nm.vlan_public | int > 0 %}.{{ nm.vlan_public }}{% endif %} route: public: address: 0.0.0.0 |