From ac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 30 Mar 2017 23:03:43 -0400 Subject: Updating Apex to OpenStack Ocata - power management updated to virtualbmc, pxe_ssh is deprecated - removing custom tacker build - removing custom congress build - disabling yum update in undercloud on the cli instead of in a patch - Undercloud is direct kernel booted now, there are no kernel and initrd in the disk image from upstream - remove OpenDaylight previous to Carbon JIRA: APEX-433 JIRA: APEX-432 JIRA: APEX-431 Change-Id: I6963f16e65eacade5607a3082b58b6150331406c Signed-off-by: Dan Radez --- ci/clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci/clean.sh') diff --git a/ci/clean.sh b/ci/clean.sh index 4335b821..bd48c0d1 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -102,6 +102,7 @@ for i in $(seq 0 $vm_index); do /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2 virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null | xargs echo -n rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null + if [ -e /root/.vbmc/baremetal$i ]; then vbmc delete baremetal$i; fi done for network in ${OPNFV_NETWORK_TYPES}; do @@ -119,7 +120,6 @@ done # clean pub keys from root's auth keys sed -i '/stack@undercloud.localdomain/d' /root/.ssh/authorized_keys -sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys # force storage cleanup -- cgit 1.2.3-korg