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/scripts/globals.sh | |
| parent | 2190992952ccc7987f4fbcaf856340ce1ca69c1f (diff) | |
| parent | 644dc6a6cd8c4a309352a2b2602d757f4acbf63b (diff) | |
Merge "states: Break on error, retry states up to 5 times" into stable/euphrates
Diffstat (limited to 'mcp/scripts/globals.sh')
| -rw-r--r-- | mcp/scripts/globals.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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} |