Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Replace ipmi with redfish-virtualmedia in VM site
[icn.git]
/
env
/
metal3
/
06_host_cleanup.sh
diff --git
a/env/metal3/06_host_cleanup.sh
b/env/metal3/06_host_cleanup.sh
index
03fca87
..
a649511
100755
(executable)
--- a/
env/metal3/06_host_cleanup.sh
+++ b/
env/metal3/06_host_cleanup.sh
@@
-1,25
+1,17
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-set -x
+set -eux -o pipefail
+
LIBDIR="$(dirname "$PWD")"
source $LIBDIR/lib/common.sh
# Kill and remove the running ironic containers
LIBDIR="$(dirname "$PWD")"
source $LIBDIR/lib/common.sh
# Kill and remove the running ironic containers
-for name in ironic ironic-inspector dnsmasq httpd mariadb; do
- sudo
podman ps | grep -w "$name$" && sudo podman kill $name
- sudo
podman ps --all | grep -w "$name$" && sudo podman rm $name
-f
+for name in ironic ironic-inspector dnsmasq httpd mariadb
ipa-downloader
; do
+ sudo
docker ps | grep -w "$name$" && sudo docker kill "$name"
+ sudo
docker ps --all | grep -w "$name$" && sudo docker rm "$name"
-f
done
done
-# Remove existing pod
-if sudo podman pod exists ironic-pod ; then
- sudo podman pod rm ironic-pod -f
-fi
-
-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}
rm -rf ${IRONIC_DATA_DIR}