From 4a22ce42b28e7b6f5d4ef17d70756df169e93e39 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Mon, 28 Sep 2015 16:26:35 -0400
Subject: Adding deploy.sh that work with RDO Manager

- adding virtual and jenkins support tested
- adding config file parameters to deploy
- instack virt-sparsify disabled for now
- adding clean script

Change-Id: I26b5968e64fa79af166b11422f5d73812d8e96d1
Signed-off-by: Dan Radez <dradez@redhat.com>
---
 build/instack.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'build/instack.sh')

diff --git a/build/instack.sh b/build/instack.sh
index 0cc09582..c19ab0fd 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -149,12 +149,13 @@ if virsh list | grep instack > /dev/null; then
     exit 1
 fi
 
-echo "\nCopying instack disk image and starting instack VM."
+echo $'\nGenerating libvirt configuration'
 virsh dumpxml baremetalbrbm_0 > baremetalbrbm_0.xml
 virsh dumpxml baremetalbrbm_1 > baremetalbrbm_1.xml
 virsh dumpxml instack > instack.xml
 #virsh vol-dumpxml instack.qcow2 --pool default > instack.qcow2.xml
-virsh net-dumpxml brbm > brbm.xml
+virsh net-dumpxml brbm > brbm-net.xml
+virsh pool-dumpxml default > default-pool.xml
 EOI
 
 # copy off the instack artifacts
@@ -162,12 +163,13 @@ echo "Copying instack files to build directory"
 scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_0.xml .
 scp ${SSH_OPTIONS[@]} stack@localhost:baremetalbrbm_1.xml .
 scp ${SSH_OPTIONS[@]} stack@localhost:instack.xml .
-scp ${SSH_OPTIONS[@]} stack@localhost:brbm.xml .
+scp ${SSH_OPTIONS[@]} stack@localhost:brbm-net.xml .
+scp ${SSH_OPTIONS[@]} stack@localhost:default-pool.xml .
 
-sudo cp /var/lib/libvirt/images/instack.qcow2 ./instack.qcow2_
-sudo chown $(whoami):$(whoami) ./instack.qcow2_
-virt-sparsify --check-tmpdir=fail ./instack.qcow2_ ./instack.qcow2
-rm -f ./instack.qcow2_
+sudo cp /var/lib/libvirt/images/instack.qcow2 ./instack.qcow2
+#sudo chown $(whoami):$(whoami) ./instack.qcow2_
+#virt-sparsify --check-tmpdir=fail ./instack.qcow2_ ./instack.qcow2
+#rm -f ./instack.qcow2_
 
 # pull down the the built images
 echo "Copying overcloud resources"
-- 
cgit 1.2.3-korg