From 4f7bf6963a1e9ae03bc0ae9189874cba561ad62f Mon Sep 17 00:00:00 2001 From: ftersin Date: Wed, 21 May 2014 22:07:36 +0400 Subject: [PATCH] Fix getting EC2 and S3 urls in create_userrc Invalid parsing of openstackclient output was introduced in I03c17cfc9740c3eb257152c95d9c4f021db2c89e. Here command lines was changed to get urls with no parsing. Also default EC2_URL was fixed. Change-Id: Ic46a9989321cf6310c56edeeb737c603a4f9c1ed --- tools/create_userrc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh index 5c1c329902..a34ad287f8 100755 --- a/tools/create_userrc.sh +++ b/tools/create_userrc.sh @@ -126,12 +126,12 @@ fi 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