From 644dc6a6cd8c4a309352a2b2602d757f4acbf63b 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 (cherry picked from commit 23f9ef727310a8ef449372313785241df6557559) --- mcp/scripts/create-config-drive.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mcp/scripts/create-config-drive.sh') diff --git a/mcp/scripts/create-config-drive.sh b/mcp/scripts/create-config-drive.sh index 51e38c60d..4b22b27ae 100755 --- a/mcp/scripts/create-config-drive.sh +++ b/mcp/scripts/create-config-drive.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e ############################################################################## # Copyright (c) 2017 Mirantis Inc. and others. # All rights reserved. This program and the accompanying materials @@ -12,6 +12,8 @@ # (using the -k/--ssh-key option) and a user-data blog (using the # -u/--user-data option). +CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x + usage () { echo "usage: ${0##*/}: [--ssh-key ] [--vendor-data ] [--user-data ] [--hostname ] " } -- cgit 1.2.3-korg