summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-26 17:52:31 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-26 17:52:31 +0400
commit2bd6a0ed390285ec8f17cc8c71a9147485ca860b (patch)
treec18aec6596cb5ff46b94cc70b48a7308e448b461 /mcp/config
parent8b48875e30afa4c60f27310df548a18c18e9af60 (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/config')
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml1
-rwxr-xr-xmcp/config/states/networking_gw12
2 files changed, 13 insertions, 0 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index b475387bd..eec97eb96 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -15,6 +15,7 @@ cluster:
- dpdk
- openstack_ha
- networks
+ - networking_gw
virtual:
nodes:
- cfg01
diff --git a/mcp/config/states/networking_gw b/mcp/config/states/networking_gw
new file mode 100755
index 000000000..ea7c87b01
--- /dev/null
+++ b/mcp/config/states/networking_gw
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+##############################################################################
+# 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
+##############################################################################
+
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+
+salt -I 'neutron:gateway' cmd.run 'ifup --force --ignore-errors br-ex'