openstack/devstack
Code Issues Proposed changes

Handle failure of openstack endpoint

Browse Source 
Change 4f7bf6963a introduced finding the
endpoint via "openstack endpoint show" only.  Previously that output
was piped through grep, etc. so it handled fell back to a blank
output when the endpoints were not available.

Ignore failures of this command so the blank output is matched

Change-Id: Iae2f09784ffa38efd2f858513bf284c84c32edac
This commit is contained in:
Ian Wienand 2014-06-24 15:06:02 +10:00
parent 4fcda870e6
commit bcdce9ea12
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

@ -126,12 +126,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) EC2_URL=$(openstack endpoint show -f value -c publicurl ec2 || true)
if [[ -z $EC2_URL ]]; then if [[ -z $EC2_URL ]]; then
EC2_URL=http://localhost:8773/services/Cloud EC2_URL=http://localhost:8773/services/Cloud
fi 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 if [[ -z $S3_URL ]]; then
S3_URL=http://localhost:3333 S3_URL=http://localhost:3333
fi fi