openstack/devstack
Code Issues Proposed changes

Merge "Handle failure of openstack endpoint"

Browse Source
This commit is contained in:
Jenkins
2014-06-24 17:54:18 +00:00
committed by Gerrit Code Review
parent 51df53bb14 bcdce9ea12
commit 690fd92096
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

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