From b4ee809c40d27d3323bb19b4edfd188ebd0535d6 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 2 Dec 2015 22:43:18 -0600
Subject: modified to include the default deployment of MAAS on virbr0 in case
 no lab is provided. modified maas deployment creating the default storage
 pool.

Change-Id: Ic48b95222c01e5b5f2984777776c306dbd226832
---
 ci/02-maasdeploy.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'ci/02-maasdeploy.sh')

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index d5e02620..b41db550 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -16,7 +16,7 @@ case "$1" in
         cp maas/att/virpod1/deployment.yaml ./deployment.yaml
         ;;
     * )
-        cp maas/intel/pod5/deployment.yaml ./deployment.yaml
+        cp maas/default/deployment.yaml ./deployment.yaml
         ;;
 esac
 
@@ -30,15 +30,7 @@ if [ ! -e /var/lib/libvirt/images ]; then
 
     sudo apt-get install libvirt-bin -y
     sudo adduser ubuntu libvirtd
-    sudo virsh pool-define /dev/stdin <<EOF
-<pool type='dir'>
-  <name>default</name>
-  <target>
-    <path>/var/lib/libvirt/images</path>
-  </target>
-</pool>
-EOF
-
+    sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/
     sudo virsh pool-start default
     sudo virsh pool-autostart default
 
@@ -52,7 +44,7 @@ sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cl
 juju init -f
 
 cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
-maas-deployer -c deployment.yaml -d --force
+sudo maas-deployer -c deployment.yaml -d --force
 
 echo "... Deployment of maas finish ...."
 
-- 
cgit 1.2.3-korg