From 34962ac0749468c4caa31c99ade76f15fb641cda Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 11 Apr 2012 17:17:04 +0200 Subject: [PATCH] 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 --- tools/heat-keystone-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.45.2