openstack/devstack
Code Issues Proposed changes

Merge "Fix role creation in tools/create_userrc.sh"

Browse Source
This commit is contained in:
Jenkins
2013-01-09 18:43:42 +00:00
committed by Gerrit Code Review
parent 8e5d2f0c7a 5b813bc489
commit db89a8189e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/create_userrc.sh
View File

@@ -173,10 +173,10 @@ function add_entry(){
fi
cat >"$rcfile" <<EOF
# you can source this file
export EC2_ACCESS_KEY=$ec2_access_key
export EC2_SECRET_KEY=$ec2_secret_key
export EC2_URL=$EC2_URL
export S3_URL=$S3_URL
export EC2_ACCESS_KEY="$ec2_access_key"
export EC2_SECRET_KEY="$ec2_secret_key"
export EC2_URL="$EC2_URL"
export S3_URL="$S3_URL"
# OpenStack USER ID = $user_id
export OS_USERNAME="$user_name"
# Openstack Tenant ID = $tenant_id
@@ -210,7 +210,7 @@ function create_or_get_role(){
if [ -n "$role_id" ]; then
echo $role_id
else
keystone tenant-create --name "$role_name" |awk '/\|[[:space:]]*id[[:space:]]*\|.*\|/ {print $4}'
keystone role-create --name "$role_name" |awk '/\|[[:space:]]*id[[:space:]]*\|.*\|/ {print $4}'
fi
}