From: Zane Bitter <zbitter@redhat.com>
Date: Wed, 11 Apr 2012 15:17:04 +0000 (+0200)
Subject: Fix setting of admin role in keystone service
X-Git-Tag: 2014.1~2051
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=34962ac0749468c4caa31c99ade76f15fb641cda;p=openstack-build%2Fheat-build.git

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>
---

diff --git a/tools/heat-keystone-service b/tools/heat-keystone-service
index 5b869c9c..3ddc6297 100755
--- a/tools/heat-keystone-service
+++ b/tools/heat-keystone-service
@@ -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