From: Steve Baker <sbaker@redhat.com>
Date: Tue, 17 Jan 2017 00:02:54 +0000 (+1100)
Subject: set -e in run-os-net-config.sh
X-Git-Tag: opnfv-6.0.0~1214^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=22ffadd3258c258069b9f4b9df140a6d4b1a5f8d;p=apex-tripleo-heat-templates.git

set -e in run-os-net-config.sh

This runs run-os-net-config.sh with set -e except for ping and
os-net-config --detailed-exit-codes which are expected to return
non-zero values.

Change-Id: Iffe00a97612ccb1c79ed037ce93f6c2e685164d9
---

diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh
index a7dbedc7..8fe2d270 100755
--- a/network/scripts/run-os-net-config.sh
+++ b/network/scripts/run-os-net-config.sh
@@ -10,7 +10,7 @@
 # a deployment input via input_values
 # $network_config : the json serialized os-net-config config to apply
 #
-set -ux
+set -eux
 
 function get_metadata_ip() {
 
@@ -98,8 +98,10 @@ EOF_CAT
             fi
         fi
     done
+    set +e
     os-net-config -c /etc/os-net-config/dhcp_all_interfaces.yaml -v --detailed-exit-codes --cleanup
     RETVAL=$?
+    set -e
     if [[ $RETVAL == 2 ]]; then
         ping_metadata_ip
     elif [[ $RETVAL != 0 ]]; then
@@ -123,8 +125,10 @@ if [ -n '$network_config' ]; then
     sed -i "s/bridge_name/${bridge_name:-''}/" /etc/os-net-config/config.json
     sed -i "s/interface_name/${interface_name:-''}/" /etc/os-net-config/config.json
 
+    set +e
     os-net-config -c /etc/os-net-config/config.json -v --detailed-exit-codes
     RETVAL=$?
+    set -e
 
     if [[ $RETVAL == 2 ]]; then
         ping_metadata_ip