local CLOUD_ENV
local CLOUD_IDENTITY_URL
local DNSAAS_SERVICE_URL
- local DNSAAS_USERNAME='demo'
- local DNSAAS_PASSWORD='onapdemo'
+ local DNSAAS_USERNAME="$(cat /opt/config/dnsaas_username.txt)"
+ local DNSAAS_PASSWORD="$(cat /opt/config/dnsaas_password.txt)"
CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
TENANT_ID="$(cat /opt/config/tenant_id.txt)"
KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
+ if [[ "$KEYSTONE_URL" == */v3 ]]; then
+ echo "$KEYSTONE_URL"
+ elif [[ "$KEYSTONE_URL" == */v2.0 ]]; then
+ echo "$KEYSTONE_URL"
+ else
+ KEYSTONE_URL="${KEYSTONE_URL}/v2.0"
+ echo "$KEYSTONE_URL"
+ fi
+
USERNAME="$(cat /opt/config/openstack_user.txt)"
PASSWORD="$(cat /opt/config/openstack_password.txt)"