From 84b8baf7b07c76743948e45ca532c5ce7de3e6a0 Mon Sep 17 00:00:00 2001 From: David Blaisonneau Date: Tue, 26 Jan 2016 14:50:52 +0100 Subject: joid: add odl controller ip in openrc file - needed for functest Change-Id: I1bf57f95d3f5dde0b7d6885ec11352e4ca4e6e9b Signed-off-by: David Blaisonneau --- jjb/joid/joid-deploy.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'jjb/joid') 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 ## -- cgit 1.2.3-korg