summaryrefslogtreecommitdiffstats
path: root/prototypes
diff options
context:
space:
mode:
Diffstat (limited to 'prototypes')
-rw-r--r--prototypes/bifrost/README.md2
-rwxr-xr-xprototypes/bifrost/scripts/destroy-env.sh (renamed from prototypes/bifrost/scripts/destroy_env.sh)10
-rw-r--r--prototypes/puppet-infracloud/README.md4
3 files changed, 10 insertions, 6 deletions
diff --git a/prototypes/bifrost/README.md b/prototypes/bifrost/README.md
index fffd1de3d..f50ffb217 100644
--- a/prototypes/bifrost/README.md
+++ b/prototypes/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/prototypes/bifrost/scripts/destroy_env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index 819048b53..4dffee62a 100755
--- a/prototypes/bifrost/scripts/destroy_env.sh
+++ b/prototypes/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/prototypes/puppet-infracloud/README.md b/prototypes/puppet-infracloud/README.md
index f3bd67279..dd9e7bb9f 100644
--- a/prototypes/puppet-infracloud/README.md
+++ b/prototypes/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.