Code Review
/
demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
415536d
)
Add handling for keystone url w/o version
21/25221/1
author
Lusheng Ji
<lji@research.att.com>
Wed, 29 Nov 2017 22:56:29 +0000
(17:56 -0500)
committer
Marco Platania
<platania@research.att.com>
Thu, 30 Nov 2017 15:25:44 +0000
(15:25 +0000)
Issue-ID: DCAEGEN2-200
Change-Id: Ie686c2443f1110c680f3821fc9e51d68ea952156
Signed-off-by: Lusheng Ji <lji@research.att.com>
(cherry picked from commit
b3afda600c08fca77f57c99a75e4c016b756bcca
)
boot/dcae2_vm_init.sh
patch
|
blob
|
history
diff --git
a/boot/dcae2_vm_init.sh
b/boot/dcae2_vm_init.sh
index
570cb70
..
b071dff
100755
(executable)
--- 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)"