diff options
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-ha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-noha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-ovs-noha.yaml | 1 | ||||
| -rwxr-xr-x | mcp/config/states/dpdk | 19 |
4 files changed, 0 insertions, 22 deletions
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml index e42d17210..9be6540c7 100644 --- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml @@ -9,7 +9,6 @@ cluster: domain: mcp-ovs-dpdk-ha.local states: - - dpdk - openstack_ha - networks virtual: diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index e1cc6d768..508c2d53b 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -9,7 +9,6 @@ cluster: domain: mcp-ovs-dpdk-noha.local states: - - dpdk - openstack_noha - neutron_gateway - networks diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml index 0acb5d213..85f74f22f 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -9,7 +9,6 @@ cluster: domain: mcp-odl-noha.local states: - - dpdk - opendaylight - openstack_noha - neutron_gateway diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk deleted file mode 100755 index 65832db84..000000000 --- a/mcp/config/states/dpdk +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -e -############################################################################## -# Copyright (c) 2017 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 - -# shellcheck disable=SC1090 -source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" - -salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk -salt -I 'nova:compute' service.restart openvswitch-switch - -# Set datapath type to netdev for public bridge -salt -I 'nova:compute' cmd.run 'ovs-vsctl br-exists br-floating && ovs-vsctl set bridge br-floating datapath_type=netdev' ignore_retcode=True |