From a055c1b6a93dafc61fd2a1c6d589102de8c3a010 Mon Sep 17 00:00:00 2001
From: JUNJIE NAN <nanjj@cn.ibm.com>
Date: Thu, 30 Oct 2014 18:51:16 +0800
Subject: [PATCH] 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
---
 bin/heat-keystone-setup | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/heat-keystone-setup b/bin/heat-keystone-setup
index c2fd3bbd13..fb58e77931 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")