openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Pass kwargs to auth plugins"

Browse Source
This commit is contained in:
Jenkins
2014-09-13 02:28:50 +00:00
committed by Gerrit Code Review
parent a779dcc530 cde863efcf
commit 27752d375a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneclient/auth/identity/v3.py
View File

@@ -73,9 +73,13 @@ class Auth(base.BaseIdentityPlugin):
headers = {'Accept': 'application/json'} headers = {'Accept': 'application/json'}
body = {'auth': {'identity': {}}} body = {'auth': {'identity': {}}}
ident = body['auth']['identity'] ident = body['auth']['identity']
rkwargs = {}
for method in self.auth_methods: for method in self.auth_methods:
name, auth_data = method.get_auth_data(session, self, headers) name, auth_data = method.get_auth_data(session,
self,
headers,
request_kwargs=rkwargs)
ident.setdefault('methods', []).append(name) ident.setdefault('methods', []).append(name)
ident[name] = auth_data ident[name] = auth_data
@@ -112,7 +116,7 @@ class Auth(base.BaseIdentityPlugin):
_logger.debug('Making authentication request to %s', self.token_url) _logger.debug('Making authentication request to %s', self.token_url)
resp = session.post(self.token_url, json=body, headers=headers, resp = session.post(self.token_url, json=body, headers=headers,
authenticated=False, log=False) authenticated=False, log=False, **rkwargs)
try: try:
resp_data = resp.json()['token'] resp_data = resp.json()['token']