From 3f03cbee810128094657b8eb364f4e2e9af7dfcd Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 1 Sep 2016 14:46:51 +0200 Subject: 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 --- jjb/infra/infra-daily-jobs.yml | 7 ++++++ jjb/infra/infra-provision.sh | 2 +- prototypes/bifrost/README.md | 2 +- prototypes/bifrost/scripts/destroy-env.sh | 42 +++++++++++++++++++++++++++++++ prototypes/bifrost/scripts/destroy_env.sh | 38 ---------------------------- prototypes/puppet-infracloud/README.md | 4 +-- 6 files changed, 53 insertions(+), 42 deletions(-) create mode 100755 prototypes/bifrost/scripts/destroy-env.sh delete mode 100755 prototypes/bifrost/scripts/destroy_env.sh 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 new file mode 100755 index 000000000..4dffee62a --- /dev/null +++ b/prototypes/bifrost/scripts/destroy-env.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2016 RedHat and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +virsh destroy jumphost.opnfvlocal || true +virsh destroy controller00.opnfvlocal || true +virsh destroy compute00.opnfvlocal || true +virsh undefine jumphost.opnfvlocal || true +virsh undefine controller00.opnfvlocal || true +virsh undefine compute00.opnfvlocal || true + +service ironic-conductor stop + +echo "removing from database" +mysql -u root ironic --execute "truncate table ports;" +mysql -u root ironic --execute "delete from node_tags;" +mysql -u root ironic --execute "delete from nodes;" +mysql -u root ironic --execute "delete from conductors;" +echo "removing leases" +> /var/lib/dnsmasq/dnsmasq.leases +echo "removing logs" +rm -rf /var/log/libvirt/baremetal_logs/*.log + +# 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" +service libvirtd restart +service ironic-api restart +service ironic-conductor start +service ironic-inspector restart diff --git a/prototypes/bifrost/scripts/destroy_env.sh b/prototypes/bifrost/scripts/destroy_env.sh deleted file mode 100755 index 819048b53..000000000 --- a/prototypes/bifrost/scripts/destroy_env.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 RedHat and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -virsh destroy jumphost.opnfvlocal || true -virsh destroy controller00.opnfvlocal || true -virsh destroy compute00.opnfvlocal || true -virsh undefine jumphost.opnfvlocal || true -virsh undefine controller00.opnfvlocal || true -virsh undefine compute00.opnfvlocal || true - -service ironic-conductor stop - -echo "removing from database" -mysql -u root ironic --execute "truncate table ports;" -mysql -u root ironic --execute "delete from node_tags;" -mysql -u root ironic --execute "delete from nodes;" -mysql -u root ironic --execute "delete from conductors;" -echo "removing leases" -> /var/lib/dnsmasq/dnsmasq.leases -echo "removing logs" -rm -rf /var/log/libvirt/baremetal_logs/*.log - -# clean up images -rm -rf /httpboot/* -rm -rf /tftpboot/* -rm -rf /var/lib/libvirt/images/*.qcow2 - -echo "restarting services" -service libvirtd restart -service ironic-api restart -service ironic-conductor start -service ironic-inspector restart 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. -- cgit 1.2.3-korg