summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJUNJIE NAN <nanjj@cn.ibm.com>2014-10-30 18:51:16 +0800
committerJUNJIE NAN <nanjj@cn.ibm.com>2014-11-05 15:09:39 +0100
commita055c1b6a93dafc61fd2a1c6d589102de8c3a010 (patch)
treeee0f1f4e914d7c8209e981af7b2645a650a52a51 /bin
parentc1b3eb22f7ab6ea60b095f88982247dd249139bf (diff)
downloadheat-a055c1b6a93dafc61fd2a1c6d589102de8c3a010.tar.gz
Remove die_if_not_set check for var user_roles
Since the later logic will add role if the user role is not found. "die_if_not_set" check will exit the main script. Closes-Bug: #1389714 Change-Id: I995cf357d09267fee55e44575e3e301bcffebca3
Diffstat (limited to 'bin')
-rwxr-xr-xbin/heat-keystone-setup1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup
index c2fd3bbd1..fb58e7793 100755
--- a/bin/heat-keystone-setup
+++ b/bin/heat-keystone-setup
@@ -156,7 +156,6 @@ add_role() {
user_roles=$(keystone user-role-list \
--user_id $user_id\
--tenant_id $tenant 2>/dev/null)
- die_if_not_set $LINENO user_roles "Fail to get user_roles for tenant($tenant) and user_id($user_id)"
if [ $? == 0 ]; then
# Folsom
existing_role=$(get_data 1 $role_id 1 echo "$user_roles")