summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/networks
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-18 16:20:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-18 16:20:15 +0000
commitabf3446f4eade931f3b98b0894028c242440ccbd (patch)
treea6cdd5e870a844e35d11ee58616ad38ebd9a9b32 /mcp/config/states/networks
parent2190992952ccc7987f4fbcaf856340ce1ca69c1f (diff)
parent644dc6a6cd8c4a309352a2b2602d757f4acbf63b (diff)
Merge "states: Break on error, retry states up to 5 times" into stable/euphrates
Diffstat (limited to 'mcp/config/states/networks')
-rwxr-xr-xmcp/config/states/networks4
1 files changed, 3 insertions, 1 deletions
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 | \