Reduced parameters not used in _populate_user()

The method "_populate_user" in /keystone/token/providers/common.py have
two parameters (domain_id and project_id)not used. the two parameters
should be reduced

Change-Id: I30e750f756259bb14ca8626c416f1511a0dc2537
Closes-bug: #1262589
This commit is contained in:
ls1175 2013-12-20 10:08:16 +08:00
parent 5fe660232d
commit 9e7fdb3680
1 changed files with 2 additions and 3 deletions

View File

@ -170,8 +170,7 @@ class V3TokenDataHelper(object):
user_id, project_id)
return [self.assignment_api.get_role(role_id) for role_id in roles]
def _populate_user(self, token_data, user_id, domain_id, project_id,
trust):
def _populate_user(self, token_data, user_id, trust):
if 'user' in token_data:
# no need to repopulate user if it already exists
return
@ -315,7 +314,7 @@ class V3TokenDataHelper(object):
token_data['bind'] = bind
self._populate_scope(token_data, domain_id, project_id)
self._populate_user(token_data, user_id, domain_id, project_id, trust)
self._populate_user(token_data, user_id, trust)
self._populate_roles(token_data, user_id, domain_id, project_id, trust,
access_token)
if include_catalog: