openstack/devstack
Code Issues Proposed changes

Fix create_userrc.sh script

Browse Source 
Patchset fixes calculating EC2_URL/S3_URL for user rc files in 'accrc' directory.
Currently calculation of these url's uses 'openstack endpoint show' command
without specifying os-identity-v3 flag. But output is empty without such flag.
So this patchset uses same construction as exists in functions-common.

Change-Id: Ia4f2510750fa0f46e2f1d58cf0a7a16782f022b3
This commit is contained in:
Andrey Pavlov 2015-08-24 22:55:19 +03:00
parent 32e0febbc0
commit 485c962667
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/create_userrc.sh
View File

@ -158,12 +158,12 @@ fi
export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT
EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true) EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true)
if [[ -z $EC2_URL ]]; then if [[ -z $EC2_URL ]]; then
EC2_URL=http://localhost:8773/ EC2_URL=http://localhost:8773/
fi fi
S3_URL=$(openstack endpoint show -f value -c publicurl s3 || true) S3_URL=$(openstack endpoint list --service s3 --interface public --os-identity-api-version=3 -c URL -f value || true)
if [[ -z $S3_URL ]]; then if [[ -z $S3_URL ]]; then
S3_URL=http://localhost:3333 S3_URL=http://localhost:3333
fi fi