diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-01-26 17:52:31 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-01-26 17:52:31 +0400 |
| commit | 2bd6a0ed390285ec8f17cc8c71a9147485ca860b (patch) | |
| tree | c18aec6596cb5ff46b94cc70b48a7308e448b461 /mcp/patches | |
| parent | 8b48875e30afa4c60f27310df548a18c18e9af60 (diff) | |
[ovs/dpdk] Configure vxlan for baremetal scenario
* switch ovs/dpdk scenario from vlan to vxlan mode
* force br-ex interface to mitigate race with incorrect state
* remove dpdk packages list (already in upstream)
Change-Id: Ib827cef2d67879fd2a86d286ca2118b22493274d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch | 30 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch b/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch new file mode 100644 index 000000000..f73931ea8 --- /dev/null +++ b/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch @@ -0,0 +1,30 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Mon, 22 Jan 2018 15:22:47 +0400 +Subject: [PATCH] [dpdk] Support ovs bridge tagging + +Bring in "tag" option for dpdk/ovs bridges +to support vlan-tagged vxlan mode. + +Change-Id: I7f1f88233694f2c8b968a6cf55584f32879ec042 + +diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls +index 1ac9e25..05fe05f 100644 +--- a/linux/network/dpdk.sls ++++ b/linux/network/dpdk.sls +@@ -110,7 +110,7 @@ linux_network_dpdk_bond_mode_{{ interface_name }}: + + linux_network_dpdk_bridge_interface_{{ interface_name }}: + cmd.run: +- - name: "ovs-vsctl add-br {{ interface_name }} -- set bridge {{ interface_name }} datapath_type=netdev" ++ - name: "ovs-vsctl add-br {{ interface_name }} -- set bridge {{ interface_name }} datapath_type=netdev{% if interface.tag is defined %} -- set port {{ interface_name }} tag={{ interface.tag }}{% endif %}" + - unless: "ovs-vsctl show | grep {{ interface_name }}" + + {# OVS dpdk needs ip address for vxlan termination on bridge br-prv #} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 1b3bfeab0..34d913ab2 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -17,3 +17,4 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch |