openstack/devstack
Code Issues Proposed changes

Fix getting EC2 and S3 urls in create_userrc

Browse Source 
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
This commit is contained in:
ftersin 2014-05-21 22:07:36 +04:00
parent 9d57dc8b04
commit 4f7bf6963a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 ec2 | grep " ec2.publicURL " | cut -d " " -f4` EC2_URL=$(openstack endpoint show -f value -c publicurl ec2)
if [[ -z $EC2_URL ]]; then if [[ -z $EC2_URL ]]; then
EC2_URL=http://localhost:8773/service/Cloud EC2_URL=http://localhost:8773/services/Cloud
fi 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 if [[ -z $S3_URL ]]; then
S3_URL=http://localhost:3333 S3_URL=http://localhost:3333
fi fi