joid: add odl controller ip in openrc file - needed for functest 39/8039/1
authorDavid Blaisonneau <david.blaisonneau@orange.com>
Tue, 26 Jan 2016 13:50:52 +0000 (14:50 +0100)
committerDavid Blaisonneau <david.blaisonneau@orange.com>
Tue, 26 Jan 2016 13:50:52 +0000 (14:50 +0100)
Change-Id: I1bf57f95d3f5dde0b7d6885ec11352e4ca4e6e9b
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
jjb/joid/joid-deploy.sh

index e855e2e..747332c 100644 (file)
@@ -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
 
 ##