diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-12 19:42:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-12 19:42:34 +0000 |
| commit | 2f58548c3e2f9068a2f6dfa682be7b462b41f29e (patch) | |
| tree | 0b6e58be23a41a77df53da5c306c5a6c6ef5b215 /mcp/config/states | |
| parent | 8bd6edd252ca5e8f62ef24ae27fe4c8123ec82f7 (diff) | |
| parent | 8dc566dbdca65c4ea8883477cafab1436d331d62 (diff) | |
Merge "[virtual/odl] Apply missing neutron.compute state"
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/neutron_compute | 12 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 1 |
2 files changed, 1 insertions, 12 deletions
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 |