From 41a4fc5510f49f4ca1a9a2936c171adb7a6eab41 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Wed, 29 Nov 2017 17:56:29 -0500 Subject: [PATCH] Add handling for keystone url w/o version Issue-ID: DCAEGEN2-200 Change-Id: Ie686c2443f1110c680f3821fc9e51d68ea952156 Signed-off-by: Lusheng Ji (cherry picked from commit b3afda600c08fca77f57c99a75e4c016b756bcca) --- boot/dcae2_vm_init.sh | 9 +++++++++ 1 file changed, 9 insertions(+) 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)" -- 2.16.6