summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 11:18:16 +0100
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 10:28:48 +0000
commitcee7d1077a36f7aee0c4e2b7cc666d1322fc9747 (patch)
tree9422cb64dd4f71c4dde01fd383858d8f8c3223ba
parent14aed02020dbd69dbca2eb3ce093078621aa4dfe (diff)
joid: correct keystone ip fetch for noha mode - correct admin-password
Please sync merge with joid 8283 Change-Id: Icc39e799a1e506e986fc6548d6a21f5761e3374f Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--jjb/joid/joid-deploy.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 35088c80f..6bd214adf 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -119,7 +119,7 @@ SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml"
# Modify Bundle
echo "------ Set openstack password ------"
-sed -i -- "s/\"admin-password\": openstack/\"admin-password\": $OS_ADMIN_PASSWORD/" $SRCBUNDLE
+sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRCBUNDLE
if [ -n "$EXTNET_NAME" ]; then
echo "------ Set openstack default network ------"
@@ -154,8 +154,16 @@ exit_on_error $? "Main deploy FAILED"
JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
-# get Keystone vip
-KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+# get Keystone ip
+case "$HA_MODE" in
+ "ha")
+ KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+ ;;
+ *)
+ KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
+ ;;
+esac
+
# get controller IP
case "$SDN_CONTROLLER" in