From a90fc16a988cd5eb53de383d0830648f758edaff Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Mon, 4 Jan 2016 15:49:26 -0500
Subject: updating vm creation for virt deployment

- replacing brbm with logical names br-netname
- replacing instack-virt-setup with tripleo scripts

JIRA: APEX-90, APEX-80

Change-Id: I58a15dee8de882e034c8af8a3368ca0647741b13
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 ci/clean.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ci/clean.sh')

diff --git a/ci/clean.sh b/ci/clean.sh
index f05b9136..58239cc6 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -17,7 +17,7 @@ CONFIG=/var/opt/opnfv
 source $CONFIG/lib/common-functions.sh
 
 vm_index=4
-ovs_bridges="brbm brbm1 brbm2 brbm3"
+ovs_bridges="br-admin br-private br-public br-storage"
 # Clean off instack VM
 virsh destroy instack 2> /dev/null || echo -n ''
 virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
@@ -32,11 +32,11 @@ rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
 
 # Clean off baremetal VMs in case they exist
 for i in $(seq 0 $vm_index); do
-  virsh destroy baremetalbrbm_brbm1_brbm2_brbm3_$i 2> /dev/null || echo -n ''
-  virsh undefine baremetalbrbm_brbm1_brbm2_brbm3_$i --remove-all-storage 2> /dev/null || echo -n ''
-  /usr/bin/touch /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2
-  virsh vol-delete baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 --pool default 2> /dev/null
-  rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_brbm2_brbm3_${i}.qcow2 2> /dev/null
+  virsh destroy baremetal$i 2> /dev/null || echo -n ''
+  virsh undefine baremetal$i --remove-all-storage 2> /dev/null || echo -n ''
+  /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2
+  virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null
+  rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
 done
 
 # Clean off created bridges
-- 
cgit 1.2.3-korg