summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-01 13:03:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-01 13:03:41 +0000
commitdc00268ff975bfcd7ec16d96962445012200d7f0 (patch)
tree955527fdd54ca19f14d45571fa052e836a202c1f
parentd00eccaba31d0f6cbeb5e93a89fee78f39ab7383 (diff)
parent3f03cbee810128094657b8eb364f4e2e9af7dfcd (diff)
Merge "infra: Fix small doc/script issues and enable mail notification"
-rw-r--r--jjb/infra/infra-daily-jobs.yml7
-rwxr-xr-xjjb/infra/infra-provision.sh2
-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
5 files changed, 18 insertions, 7 deletions
diff --git a/jjb/infra/infra-daily-jobs.yml b/jjb/infra/infra-daily-jobs.yml
index 64c2fc09c..b4f5b91d1 100644
--- a/jjb/infra/infra-daily-jobs.yml
+++ b/jjb/infra/infra-daily-jobs.yml
@@ -96,6 +96,10 @@
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+ publishers:
+ - email:
+ recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
+
- job-template:
name: 'infra-{phase}-{pod}-daily-{stream}'
@@ -118,6 +122,9 @@
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-noha'
+ - string:
+ name: CLEAN_DIB_IMAGES
+ default: 'false'
scm:
- git-scm:
diff --git a/jjb/infra/infra-provision.sh b/jjb/infra/infra-provision.sh
index 5ddbaf968..45ed3b928 100755
--- a/jjb/infra/infra-provision.sh
+++ b/jjb/infra/infra-provision.sh
@@ -21,7 +21,7 @@ cp -R /opt/releng/prototypes/bifrost/* /opt/bifrost/
# cleanup remnants of previous deployment
cd /opt/bifrost
-./scripts/destroy_env.sh
+./scripts/destroy-env.sh
# provision 3 VMs; jumphost, controller, and compute
cd /opt/bifrost
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.