openstack
/
heat-cfntools
Code Issues Proposed changes

Fix setting of admin role in keystone service 

The script was looking for the "admin" user instead of the "admin" *role*.

Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-04-11 17:17:04 +02:00
parent 1185476275
commit 34962ac074
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/heat-keystone-service
View File

@ -22,7 +22,7 @@ if [[ -z "$SERVICE_TOKEN" ]]; then
exit 1
fi
ADMIN_ROLE=$(keystone user-list | grep True | cut -d\| -f2,5 | grep admin | cut -d\| -f1)
ADMIN_ROLE=$(keystone role-list | awk -F\| '($3 ~ "^ admin *$") { print $2 }')
SERVICE_TENANT=$(keystone tenant-list | grep service | cut -d\| -f2)
SERVICE_PASSWORD=${SERVICE_PASSWORD:-$OS_PASSWORD}
if [[ "$SERVICE_PASSWORD" == "$OS_PASSWORD" ]]; then