From f3c28248e67eeec3a871844e7d528446421e5507 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 30 Sep 2015 16:14:54 -0500
Subject: to create default pool in virsh

Change-Id: I13c94a371e85f12aac12c751fcd5723490efad66
---
 ci/02-maasdeploy.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 2df7c0a8..d8afb0c5 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -18,16 +18,15 @@ case "$1" in
 esac
 
 echo "... Deployment of maas Started ...."
-sudo apt-add-repository ppa:maas-deployers/stable -y
-sudo apt-get update -y
-sudo apt-get install maas-deployer -y
 
-if [ ! -e /home/ubuntu/.ssh/id_rsa ]; then
-    ssh-keygen -N '' -f /home/ubuntu/.ssh/id_rsa
+if [ ! -e $HOME/.ssh/id_rsa ]; then
+    ssh-keygen -N '' -f $HOME/.ssh/id_rsa
 fi
-sudo adduser ubuntu libvirtd
 
-if [ ! 'virsh pool-list | grep default' ]; then
+if [ ! -e /var/lib/libvirt/images ]; then
+
+    sudo apt-get install libvirt-bin -y
+    sudo adduser ubuntu libvirtd
 
     virsh pool-define /dev/stdin <<EOF
 <pool type='dir'>
@@ -43,7 +42,11 @@ EOF
 
 fi
 
-cat /home/ubuntu/.ssh/id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys
+sudo apt-add-repository ppa:maas-deployers/stable -y
+sudo apt-get update -y
+sudo apt-get install maas-deployer -y
+
+cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
 maas-deployer -c deployment.yaml -d --force
 echo "... Deployment of maas finish ...."
 
-- 
cgit 1.2.3-korg