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/virtual_control_plane | |
| 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/virtual_control_plane')
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index ec8fc9c15..909439134 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -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" @@ -20,7 +22,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -salt -C 'kvm*' state.sls libvirt +wait_for 5 "salt -C 'kvm*' state.sls libvirt" salt -C '* and not cfg01* and not mas01*' state.apply salt salt -C 'kvm*' saltutil.sync_all |