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/deploy.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'ci/deploy.sh')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8941cdce..0c6fc892 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -7,8 +7,8 @@ set -ex
 
 opnfvsdn=odl
 opnfvtype=nonha
-openstack=kilo
-opnfvlab=intelpod5
+openstack=liberty
+opnfvlab=default
 opnfvrel=b
 
 read_config() {
@@ -22,7 +22,7 @@ read_config() {
 usage() { echo "Usage: $0 [-s <odl|opencontrail>]
                          [-t <nonha|ha|tip>] 
                          [-o <juno|kilo|liberty>]
-                         [-l <intelpod5>]
+                         [-l <default|intelpod5>]
                          [-r <a|b>]" 1>&2 exit 1; } 
 
 while getopts ":s:t:o:l:h:r:" opt; do
@@ -51,10 +51,9 @@ while getopts ":s:t:o:l:h:r:" opt; do
 done
 
 deploy_dep() {
-    sudo apt-get install git -y 
     sudo apt-add-repository ppa:juju/stable -y
     sudo apt-get update
-    sudo apt-get install juju juju-deployer -y
+    sudo apt-get install juju git juju-deployer -y
     juju init -f
     cp environments.yaml ~/.juju/
 }
-- 
cgit 1.2.3-korg