diff options
| author |   David Blaisonneau <david.blaisonneau@orange.com> | 2016-01-28 09:50:16 +0100 |
|---|---|---|
| committer | David Blaisonneau <david.blaisonneau@orange.com> | 2016-01-28 09:51:18 +0100 |
| commit | 14aed02020dbd69dbca2eb3ce093078621aa4dfe (patch) | |
| tree | bf80ef55b141c0a09989e0aacbf45126fbbb9779 | |
| parent | 6fcc39c81cc46375212ca2254e4890bafad373a6 (diff) | |
joid: add onos in sdn controller ip to send to functest via adminrc
Change-Id: If72e45d172f8b518a4ca929184376063edc5534a
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 747332cab..35088c80f 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -153,9 +153,23 @@ 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) -ODL_CONTROLLER=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') -ODL_PASSWORD=admin + +# get controller IP +case "$SDN_CONTROLLER" in + "odl_l2" | "odl_l3") + SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') + ;; + "onos") + SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //') + ;; + *) + SDN_CONTROLLER_IP='none' + ;; +esac +SDN_PASSWORD='admin' # export the openrc file cat << EOF > $JOID_ADMIN_OPENRC @@ -164,8 +178,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 +export SDN_CONTROLLER=$SDN_CONTROLLER_IP +export SDN_PASSWORD=$SDN_PASSWORD EOF ## |