From 9508bba042aff640bba427f8427a8f3fc86234cb Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Wed, 19 Mar 2014 12:56:54 -0500 Subject: [PATCH] Add user_id when calling populate_roles_for_groups The call to _populate_roles_for_groups was missing the user_id, and was always defaulted to None. closes bug: #1294781 Change-Id: Ic78c66a1cbd0a32630f7247f0176ced2de352921 --- keystone/token/providers/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone/token/providers/common.py b/keystone/token/providers/common.py index 753131edf..6c5306bea 100644 --- a/keystone/token/providers/common.py +++ b/keystone/token/providers/common.py @@ -500,7 +500,7 @@ class BaseProvider(provider.Provider): if project_id or domain_id: roles = self.v3_token_data_helper._populate_roles_for_groups( - group_ids, project_id, domain_id) + group_ids, project_id, domain_id, user_id) token_data.update({'roles': roles}) else: idp = auth_context[federation.IDENTITY_PROVIDER]