X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Fmetal3%2F06_host_cleanup.sh;h=a649511ff5a09cc073e6b36f1eb9c67ef839d8f3;hb=038ef9e91d14bb90a81a6273a461a6472e18b408;hp=641e31e3b0486e975f58e20d9df61f8654b5ff74;hpb=e06ac6db39182fdf590dcc26b65de7a817c61b6d;p=icn.git

diff --git a/env/metal3/06_host_cleanup.sh b/env/metal3/06_host_cleanup.sh
index 641e31e..a649511 100755
--- a/env/metal3/06_host_cleanup.sh
+++ b/env/metal3/06_host_cleanup.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -x
+set -eux -o pipefail
+
 LIBDIR="$(dirname "$PWD")"
 
 source $LIBDIR/lib/common.sh
@@ -10,17 +11,7 @@ for name in ironic ironic-inspector dnsmasq httpd mariadb ipa-downloader; do
     sudo docker ps --all | grep -w "$name$" && sudo docker rm "$name" -f
 done
 
-ip link set provisioning down
-brctl delbr provisioning
-
-ip link set dhcp0 down
-brctl delbr dhcp0
+ip link set provisioning down || true
+ip link del provisioning type bridge || true
 
-rm -rf ${BS_DHCP_DIR}
 rm -rf ${IRONIC_DATA_DIR}
-
-#Kubeadm usage is deprecated in v1.0.0
-#kubeadm reset -f
-#iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X
-#rm -rf $HOME/.kube/config
-#rm -rf /var/lib/etcd