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/scripts/globals.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mcp/scripts/globals.sh') diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 6dabe65fe..ce4f9ffe9 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -1,4 +1,4 @@ -#!/bin/bash -ex +#!/bin/bash -e ############################################################################## # Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. # All rights reserved. This program and the accompanying materials @@ -8,6 +8,7 @@ ############################################################################## # Global variables +export CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} export SALT_MASTER=${INSTALLER_IP:-10.20.0.2} export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} -- cgit 1.2.3-korg