openstack/devstack
Code Issues Proposed changes

Merge "Fix getting EC2 and S3 urls in create_userrc"

Browse Source
This commit is contained in:
Jenkins 2014-05-22 18:04:54 +00:00 committed by Gerrit Code Review
commit 2109d74db5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/create_userrc.sh
View File

@ -126,12 +126,12 @@ fi
export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT
EC2_URL=`openstack endpoint show ec2 | grep " ec2.publicURL " | cut -d " " -f4`
EC2_URL=$(openstack endpoint show -f value -c publicurl ec2)
if [[ -z $EC2_URL ]]; then
EC2_URL=http://localhost:8773/service/Cloud
EC2_URL=http://localhost:8773/services/Cloud
fi
S3_URL=`openstack endpoint show s3 | grep " s3.publicURL " | cut -d " " -f4`
S3_URL=$(openstack endpoint show -f value -c publicurl s3)
if [[ -z $S3_URL ]]; then
S3_URL=http://localhost:3333
fi