summaryrefslogtreecommitdiffstats
path: root/bifrost
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-01 14:46:51 +0200
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit2a6bceea6c50d15b4739fe273101d5d8689e0b6a (patch)
tree299efd5949b955470f58cf7abde0e15ba21a4311 /bifrost
parentb2e18e76e5c47b6e099d471fe05624f0b64d226a (diff)
infra: Fix small doc/script issues and enable mail notification
This change - Fixes readme of puppet-infracloud - renames destroy_env.sh script - enables mail notification - disables removal of DIB images by default Change-Id: I628b26b976e38772cbbc69b737a545fe801639ba Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'bifrost')
-rw-r--r--bifrost/README.md2
-rwxr-xr-xbifrost/scripts/destroy-env.sh (renamed from bifrost/scripts/destroy_env.sh)10
2 files changed, 8 insertions, 4 deletions
diff --git a/bifrost/README.md b/bifrost/README.md
index fffd1de3..f50ffb21 100644
--- a/bifrost/README.md
+++ b/bifrost/README.md
@@ -24,7 +24,7 @@ Please follow that steps:
5. Run destroy script if you need to cleanup previous environment::
cd /opt/bifrost
- ./scripts/destroy_env.sh
+ ./scripts/destroy-env.sh
6. Run deployment script to spin up 3 vms with bifrost: jumphost, controller and compute::
diff --git a/bifrost/scripts/destroy_env.sh b/bifrost/scripts/destroy-env.sh
index 819048b5..4dffee62 100755
--- a/bifrost/scripts/destroy_env.sh
+++ b/bifrost/scripts/destroy-env.sh
@@ -26,9 +26,13 @@ echo "removing leases"
echo "removing logs"
rm -rf /var/log/libvirt/baremetal_logs/*.log
-# clean up images
-rm -rf /httpboot/*
-rm -rf /tftpboot/*
+# clean up dib images only if requested explicitly
+if [ $CLEAN_DIB_IMAGES = "true" ]; then
+ rm -rf /httpboot/*
+ rm -rf /tftpboot/*
+fi
+
+# remove VM disk images
rm -rf /var/lib/libvirt/images/*.qcow2
echo "restarting services"