From: David Blaisonneau <david.blaisonneau@orange.com>
Date: Thu, 28 Jan 2016 10:18:16 +0000 (+0100)
Subject: joid: correct keystone ip fetch for noha mode - correct admin-password
X-Git-Tag: brahmaputra.1.0~111^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F8279%2F2;p=releng.git

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>
---

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