diff options
Diffstat (limited to 'jjb/joid/joid-deploy.sh')
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 991a2bc5a..747332cab 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -44,6 +44,8 @@ fi POD=orange-pod2 ;; juniper-us-test-1) POD=juniper-pod1 ;; + *virtual*) + POD=default ;; *) POD=$NODE_NAME ;; esac @@ -152,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 @@ -160,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 ## @@ -199,6 +205,8 @@ exit_on_error $? "Deploy FAILED to auth to openstack" # If we have more information than only the name, try to create it if [ -z "$EXTNET_TYPE" ]; then echo "------ No data for external network creation, pass ------" +elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then + echo "------ ONOS have created the external network, pass ------" else echo "------ External network creation ------" neutron net-create $EXTNET_NAME --router:external True \ |