Merge "Add kubevirt to e2e tested addons"

[icn.git] / env / metal3 / 02_configure.sh

diff --git a/env/metal3/02_configure.sh b/env/metal3/02_configure.sh
index e05abc1..d2842d2 100755 (executable)
--- a/env/metal3/02_configure.sh
+++ b/env/metal3/02_configure.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -xe
+set -eux -o pipefail
+
 LIBDIR="$(dirname "$PWD")"
 
 source $LIBDIR/lib/logging.sh
@@ -14,7 +15,8 @@ function check_interface_ip {
     local interface=$1
     local ipaddr=$2
 
-    if [ ! $(ip addr show dev $interface) ]; then
+    ip addr show dev $interface
+    if [ $? -ne 0 ]; then
         exit 1
     fi
 
@@ -163,9 +165,10 @@ function configure {
     configure_ironic_interfaces
 }
 
-if [ "$1" == "-o" ]; then
+if [ "$#" -eq 0 ]; then
+    configure online
+elif [ "$1" == "-o" ]; then
     configure offline
-    exit 0
+else
+    exit 1
 fi
-
-configure