From d27608283966794e0b93cd9ce12412f6ab8d16e4 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Wed, 18 Oct 2017 19:56:15 -0400
Subject: cleanup code

1. remove unused code due to juju>2 & maas>2.2 in Ubuntu16.04
2. remove deprecated 03-maasdeploy.sh
3. remove other unused code

Change-Id: I20fd0e96400db1262b0df3ef2b502c8001dd5b76
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
(cherry picked from commit 2819ba063c1a9896ccf437f85ca4c2ee463d7e80)
---
 ci/01-bootstrap.sh | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'ci/01-bootstrap.sh')

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index 88f87dd5..e45c2ee0 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -2,21 +2,6 @@
 
 set -ex
 
-#export JUJU_DEV_FEATURE_FLAGS=address-allocation
-
-jujuver=`juju --version`
-
-if [[ "$jujuver" < "2" ]]; then
-  juju bootstrap --debug --to bootstrap.maas --agent-version 1.25.5
-  sleep 5
-  #disable juju gui until xenial charms are in charm store.
-  juju deploy cs:juju-gui-130 --to 0
-
-  JUJU_REPOSITORY=
-  juju set-constraints tags=
-
-else
-  controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
-  cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
-  juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
-fi
+controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
-- 
cgit 1.2.3-korg