diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-10-27 08:31:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-27 08:31:56 +0000 |
commit | cad8852bf819f51f2e9602b11d4fc8b723623006 (patch) | |
tree | d78bf4fb4ebd94df2a7d8209944b879b9c1fd1c0 /ci/01-bootstrap.sh | |
parent | 0b6cf885239f5612c19db205d9a827572ad73c8a (diff) | |
parent | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (diff) |
Merge "cleanup code"
Diffstat (limited to 'ci/01-bootstrap.sh')
-rwxr-xr-x | ci/01-bootstrap.sh | 21 |
1 files changed, 3 insertions, 18 deletions
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 |