Updated to CENGN Skywalker addressing.

[joid.git] / ci / 01-bootstrap.sh

diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index 5ec5e68..88f87dd 100755 (executable)
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -6,8 +6,8 @@ set -ex
 
 jujuver=`juju --version`
 
-if [ "$jujuver" < "2" ]; then
-  juju bootstrap --debug --to bootstrap.maas
+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
@@ -16,7 +16,7 @@ if [ "$jujuver" < "2" ]; then
   juju set-constraints tags=
 
 else
-  controllername=`awk 'NR==1{print $2}' environments.yaml`
-  cloudname=`awk 'NR==1{print $2}' environments.yaml`
+  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