aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-12 19:42:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-12 19:42:34 +0000
commit2f58548c3e2f9068a2f6dfa682be7b462b41f29e (patch)
tree0b6e58be23a41a77df53da5c306c5a6c6ef5b215 /mcp/config
parent8bd6edd252ca5e8f62ef24ae27fe4c8123ec82f7 (diff)
parent8dc566dbdca65c4ea8883477cafab1436d331d62 (diff)
Merge "[virtual/odl] Apply missing neutron.compute state"
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml1
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml1
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml1
-rwxr-xr-xmcp/config/states/neutron_compute12
-rwxr-xr-xmcp/config/states/openstack_noha1
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