summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-28 16:47:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-28 16:47:07 +0000
commitfb155791e82b4dd41ae053fb5220cc1c88633c01 (patch)
tree1635dd50db91df0cfc131448b1adcc8676db047d
parent0aa95b206e4aa7b941a6b2159359742e333c3a58 (diff)
parentcee7d1077a36f7aee0c4e2b7cc666d1322fc9747 (diff)
Merge "joid: correct keystone ip fetch for noha mode - correct admin-password"
-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 cdf92a785..9d15390b3 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -127,7 +127,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 ------"
@@ -162,8 +162,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