commit 690fd92096c3fd561c2e2c86affd10b429658bb2
author Jenkins <jenkins@review.openstack.org> Tue Jun 24 17:54:18 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 24 17:54:18 2014 +0000
tree b92e23241f190e560938ac99febbce3223942bee
parent 51df53bb143980e0315209dd24614c71268e54e4
parent bcdce9ea12a5a0613936bbfdc13f43f7f0c13d97

Merge "Handle failure of openstack endpoint"

tools/create_userrc.sh

diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
index a34ad28..5b1111a 100755
--- a/tools/create_userrc.sh
+++ b/tools/create_userrc.sh
@@ -126,12 +126,12 @@
 
 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