From 2a6bceea6c50d15b4739fe273101d5d8689e0b6a Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 1 Sep 2016 14:46:51 +0200 Subject: [PATCH] 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 --- bifrost/README.md | 2 +- bifrost/scripts/{destroy_env.sh => destroy-env.sh} | 10 +++++++--- puppet-infracloud/README.md | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) rename bifrost/scripts/{destroy_env.sh => destroy-env.sh} (89%) 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 similarity index 89% rename from bifrost/scripts/destroy_env.sh rename to 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" diff --git a/puppet-infracloud/README.md b/puppet-infracloud/README.md index f3bd6727..dd9e7bb9 100644 --- a/puppet-infracloud/README.md +++ b/puppet-infracloud/README.md @@ -11,7 +11,7 @@ Once all the hardware is provisioned, enter in controller and compute nodes and 2. Copy hiera to the right place:: - cp /opt/releng/prototypes/puppet-infracloud/hiera/common.yaml /var/lib/hiera/ + cp /opt/releng/prototypes/puppet-infracloud/hiera/common.yaml /var/lib/hiera 3. Install modules:: @@ -21,7 +21,7 @@ Once all the hardware is provisioned, enter in controller and compute nodes and 4. Apply the infracloud manifest:: cd /opt/releng/prototypes/puppet-infracloud - puppet apply --manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules + puppet apply manifests/site.pp --modulepath=/etc/puppet/modules:/opt/releng/prototypes/puppet-infracloud/modules 5. Once you finish this operation on controller and compute nodes, you will have a functional OpenStack cloud. -- 2.16.6