From 23f9ef727310a8ef449372313785241df6557559 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 14 Oct 2017 22:47:45 +0200 Subject: states: Break on error, retry states up to 5 times While applying scenario states, break on error, and retry failed state up to 5 times. Apply the same behavior for `salt.sh`. Add new deploy parameter, '-D', backed up by 'CI_DEBUG' env var, which gates deploy sh scripts logging (set -x). Also extend '-f' deploy parameter, allowing it to be specified more than once; the first occurence will skip infra VM creation, but still sync reclass & other config from local repo, while a second occurence will also disable config sync. To prevent glusterfs client state from failing due to non-existent nova user/group, move it after nova:compute's nova state is applied. Change-Id: I234e126e16be0e133d878957bd88fed946955de8 Signed-off-by: Alexandru Avadanii --- mcp/config/states/networks | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mcp/config/states/networks') diff --git a/mcp/config/states/networks b/mcp/config/states/networks index 361e675a8..d4735adb3 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks @@ -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 + # Determine public network based on external IPs from compute node # NOTE: mask currently hardcoded to /24 PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ -- cgit 1.2.3-korg