openstack/devstack
Code Issues Proposed changes

Merge "Fix create_userrc.sh script"

Browse Source
This commit is contained in:
Jenkins
2015-09-01 18:19:45 +00:00
committed by Gerrit Code Review
parent 2dd78dd885 485c962667
commit e306fd3c2a
1 changed files with 2 additions and 2 deletions
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
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
EC2_URL=http://localhost:8773/
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
S3_URL=http://localhost:3333
fi