diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:20:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-18 16:20:15 +0000 |
| commit | abf3446f4eade931f3b98b0894028c242440ccbd (patch) | |
| tree | a6cdd5e870a844e35d11ee58616ad38ebd9a9b32 /mcp/config/states/openstack_ha | |
| parent | 2190992952ccc7987f4fbcaf856340ce1ca69c1f (diff) | |
| parent | 644dc6a6cd8c4a309352a2b2602d757f4acbf63b (diff) | |
Merge "states: Break on error, retry states up to 5 times" into stable/euphrates
Diffstat (limited to 'mcp/config/states/openstack_ha')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 230288f4f..2e55fc890 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash -e ############################################################################## # Copyright (c) 2017 Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials @@ -7,6 +7,8 @@ # 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" @@ -37,7 +39,6 @@ salt -I 'keystone:client' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 -salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'keystone:server' state.sls keystone.server salt -I 'nova:controller' state.sls nova -b 1 @@ -50,6 +51,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova +salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'mongodb:server' state.sls mongodb wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" |