Check for errors by default in scripts

[icn.git] / deploy / metal3-vm / 05_host_cleanup.sh

diff --git a/deploy/metal3-vm/05_host_cleanup.sh b/deploy/metal3-vm/05_host_cleanup.sh
index 5c49a35..c8edd48 100755 (executable)
--- a/deploy/metal3-vm/05_host_cleanup.sh
+++ b/deploy/metal3-vm/05_host_cleanup.sh
@@ -1,13 +1,16 @@
 #!/usr/bin/env bash
-set -x
+set -eux -o pipefail
 
 # shellcheck disable=SC1091
 source lib/logging.sh
 # shellcheck disable=SC1091
 source lib/common.sh
 
+BMO_RUN_LOCAL="${BMO_RUN_LOCAL:-false}"
+CAPBM_RUN_LOCAL="${CAPBM_RUN_LOCAL:-false}"
+
 # Kill and remove the running ironic containers
-for name in ironic ironic-inspector dnsmasq httpd mariadb; do
+for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do
     sudo "${CONTAINER_RUNTIME}" ps | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" kill $name
     sudo "${CONTAINER_RUNTIME}" ps --all | grep -w "$name$" && sudo "${CONTAINER_RUNTIME}" rm $name -f
 done
@@ -53,3 +56,6 @@ if [ "$MANAGE_BR_BRIDGE" == "y" ]; then
     sudo ifdown baremetal || true
     sudo rm -f /etc/sysconfig/network-scripts/ifcfg-baremetal || true
 fi
+
+rm -rf $WORKING_DIR
+rm -rf $IRONIC_DATA_DIR