commit 2109d74db5df2c8858ca51f48f1bffbc9df89041
author Jenkins <jenkins@review.openstack.org> Thu May 22 18:04:54 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 22 18:04:54 2014 +0000
tree 3ac8f0662f389867e951edd2191cc54250a84e1b
parent 85c02af0741d72fe65c8415f3fbf67a3775e1c81
parent 4f7bf6963a1e9ae03bc0ae9189874cba561ad62f

Merge "Fix getting EC2 and S3 urls in create_userrc"

tools/create_userrc.sh

diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
index 5c1c329..a34ad28 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 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