diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-12 16:39:41 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-12 16:39:41 +0400 |
| commit | 8dc566dbdca65c4ea8883477cafab1436d331d62 (patch) | |
| tree | 9a0177649494af1f3b763ab583d0509beebb0bfb /mcp/config | |
| parent | d6c6e357854725975797c3ac0805781220885eed (diff) | |
[virtual/odl] Apply missing neutron.compute state
Change-Id: I078e11219fb8dea4505c46e7f75c295c5a72c59b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-noha.yaml | 1 | ||||
| -rw-r--r-- | mcp/config/scenario/os-ovn-nofeature-noha.yaml | 1 | ||||
| -rwxr-xr-x | mcp/config/states/neutron_compute | 12 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 1 |
5 files changed, 1 insertions, 15 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 4af625b25..3a36ae297 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -11,7 +11,6 @@ cluster: states: - openstack_noha - neutron_gateway - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index a1e53e750..eed17c1a4 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -12,7 +12,6 @@ cluster: - dpdk - openstack_noha - neutron_gateway - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index 8f29d7bb1..0e4d644d7 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -11,7 +11,6 @@ cluster: states: - openstack_noha - ovn_ctl_opts - - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute deleted file mode 100755 index c6b90e20d..000000000 --- a/mcp/config/states/neutron_compute +++ /dev/null @@ -1,12 +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 - -salt -I 'neutron:compute' state.sls neutron diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 9fc30bbf1..4c8cbcf8a 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -42,6 +42,7 @@ salt -I 'cinder:controller' state.sls cinder wait_for 3 "salt -I 'cinder:volume' state.sls cinder" salt -I 'neutron:server' state.sls neutron +salt -I 'neutron:compute' state.sls neutron salt -I 'nova:compute' state.sls nova |