summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-26 14:50:52 +0100
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-26 14:50:52 +0100
commit84b8baf7b07c76743948e45ca532c5ce7de3e6a0 (patch)
treee5b3d4549367e39c91ef3ef6f865cf32fe16b10c
parent97b26e5d26a59d2f0dd520b088cc68741fec55d7 (diff)
joid: add odl controller ip in openrc file - needed for functest
Change-Id: I1bf57f95d3f5dde0b7d6885ec11352e4ca4e6e9b Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--jjb/joid/joid-deploy.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index e855e2e2d..747332cab 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -154,6 +154,8 @@ exit_on_error $? "Main deploy FAILED"
JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
+ODL_CONTROLLER=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //')
+ODL_PASSWORD=admin
# export the openrc file
cat << EOF > $JOID_ADMIN_OPENRC
@@ -162,6 +164,8 @@ export OS_PASSWORD=$OS_ADMIN_PASSWORD
export OS_TENANT_NAME=admin
export OS_AUTH_URL=http://$KEYSTONE:5000/v2.0
export OS_REGION_NAME=Canonical
+export ODL_CONTROLLER=$ODL_CONTROLLER
+export ODL_PASSWORD=$ODL_PASSWORD
EOF
##