diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-16 15:57:52 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-16 15:57:52 +0400 |
| commit | f74f7bac151f69ae0b50f28e68805a5d8580736e (patch) | |
| tree | 28c15d12bb04aff97c98c927a8576109af16c230 /mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | |
| parent | 9dfa19de4ae2962152c866657c9a2f60f96a1795 (diff) | |
[ovs/dpdk] Set bridge datapath_type to netdev
This prevents neutron ovs agent to re-create existing bridge which
might cause unpredictable/faulty state of network interfaces.
Change-Id: I289365e1dea7d178b5b72eb506f5c711f6d60199
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch')
| -rw-r--r-- | mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch | 16 |
1 files changed, 7 insertions, 9 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 e2396de2b..86c1d510d 100644 --- a/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch +++ b/mcp/patches/0015-Set-ovs-bridges-as-L3-interfaces.patch @@ -14,21 +14,19 @@ Change-Id: I1e83129cc184cf481bea21d7aa452bf60d9e0499 diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge new file mode 100644 -index 0000000..575d38f +index 0000000..216581f --- /dev/null +++ b/linux/files/ovs_bridge -@@ -0,0 +1,12 @@ +@@ -0,0 +1,10 @@ +auto {{ bridge_name }} +allow-ovs {{ bridge_name }} +iface {{ bridge_name }} inet static + ovs_type OVSBridge + address {{ bridge.address }} + netmask {{ bridge.netmask }} -+ {%- if bridge.gateway is defined %} -+ gateway {{ bridge.gateway }} -+ {%- endif %} -+ {%- if bridge.ovs_options is defined %} -+ ovs_options {{ bridge.ovs_options }} ++ mtu {{ bridge.get('mtu', '1500') }} ++ {%- if bridge.datapath_type is defined %} ++ ovs_extra set Bridge ${IFACE} datapath_type={{ bridge.datapath_type }} + {%- endif %} diff --git a/linux/files/ovs_port b/linux/files/ovs_port index 222ca8e..efb0307 100644 @@ -45,10 +43,10 @@ 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 3e79847..dc7180a 100644 +index fa37e5e..b5ed1ae 100644 --- a/linux/network/interface.sls +++ b/linux/network/interface.sls -@@ -72,6 +72,34 @@ remove_cloud_init_file: +@@ -91,6 +91,34 @@ add_int_{{ int_name }}_to_ovs_dpdk_bridge_{{ interface_name }}: ovs_bridge_{{ interface_name }}: openvswitch_bridge.present: - name: {{ interface_name }} |