Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "prototypes: bifrost: Ignore dnsmasq service failures"
[releng.git]
/
prototypes
/
bifrost
/
scripts
/
destroy-env.sh
diff --git
a/prototypes/bifrost/scripts/destroy-env.sh
b/prototypes/bifrost/scripts/destroy-env.sh
index
86d7bc4
..
cdc55df
100755
(executable)
--- a/
prototypes/bifrost/scripts/destroy-env.sh
+++ b/
prototypes/bifrost/scripts/destroy-env.sh
@@
-37,15
+37,16
@@
rm -rf /var/log/libvirt/baremetal_logs/*.log
CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false}
if [ $CLEAN_DIB_IMAGES = "true" ]; then
CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false}
if [ $CLEAN_DIB_IMAGES = "true" ]; then
- rm -rf /httpboot/*
- rm -rf /tftpboot/*
+ rm -rf /httpboot /tftpboot
+ mkdir /httpboot /tftpboot
+ chmod -R 755 /httpboot /tftpboot
fi
# remove VM disk images
rm -rf /var/lib/libvirt/images/*.qcow2
echo "restarting services"
fi
# remove VM disk images
rm -rf /var/lib/libvirt/images/*.qcow2
echo "restarting services"
-service dnsmasq restart
+service dnsmasq restart
|| true
service libvirtd restart
service ironic-api restart
service ironic-conductor start
service libvirtd restart
service ironic-api restart
service ironic-conductor start