openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Steve Baker 2017-01-17 11:02:54 +11:00
parent 97488b8ba3
commit 22ffadd325
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/scripts/run-os-net-config.sh
View File

@ -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