summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-11-30 15:25:36 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-30 15:25:36 +0000
commitfbaec5b119dec480c4795204030ac64a02283699 (patch)
treef4f820731c7bdf1e2d4febde066f3e9c84032705
parentd6524804f5851dd1134c3780d006041fb67fb802 (diff)
parentb3afda600c08fca77f57c99a75e4c016b756bcca (diff)
Merge "Add handling for keystone url w/o version"
-rwxr-xr-xboot/dcae2_vm_init.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index 570cb704..b071dffd 100755
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -450,6 +450,15 @@ register_dns_zone_designate()
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)"