From 769c8026c814a4746db2bd7ff1cd2937e74381bd Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 2 Nov 2016 13:42:22 -0500
Subject: [PATCH] modified worker mutiplier from 1.0 to 1.1 as 1.0 is
considered as integer rather than floating.
Change-Id: I463b7b3334d5c453caf5397baab9e4f36b7892df
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
ci/01-bootstrap.sh | 4 ++--
ci/02-deploybundle.sh | 2 +-
juju/configure-juju-on-openstack | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index f09c8670..6adc2cff 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -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)}' deployment.yaml`
+ cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml`
juju bootstrap $controllername $cloudname --debug --to bootstrap.maas
fi
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index f51ebe26..c96e45f3 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -64,7 +64,7 @@ if [ -e ./deployment.yaml ]; then
echo $max
if [ "$max" -lt 4 ];then
- workmutiple=1.0
+ workmutiple=1.1
elif [ "$max" -lt 33 ]; then
workmutiple=0.25
elif [ "$max" -lt 73 ]; then
diff --git a/juju/configure-juju-on-openstack b/juju/configure-juju-on-openstack
index 8040e821..bf31514c 100755
--- a/juju/configure-juju-on-openstack
+++ b/juju/configure-juju-on-openstack
@@ -36,7 +36,7 @@ then
associated=1
FLOAT_IP="$(openstack server list | grep jumpserver2 | awk '{ print $13 }')"
else
- FLOAT_IP="$(openstack ip floating create ext-net -c ip -f value)"
+ FLOAT_IP="$(openstack floating ip create ext-net -c floating_ip_address -f value)"
fi
#Launch an instance
--
2.16.6