summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-13 02:28:50 +0000
committerGerrit Code Review <review@openstack.org>2014-09-13 02:28:50 +0000
commit27752d375a3a65a0725f56854b0dbb2b447f2999 (patch)
tree7fa6c2a2f2cdfa798a5a816cc50d96437ecf1845
parenta779dcc530cbcf48476357f2f5e3cc6de66d07d9 (diff)
parentcde863efcf654a0016d325fe3d9c0a4c97ba9ebe (diff)
downloadpython-keystoneclient-27752d375a3a65a0725f56854b0dbb2b447f2999.tar.gz
Merge "Pass kwargs to auth plugins"
-rw-r--r--keystoneclient/auth/identity/v3.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/keystoneclient/auth/identity/v3.py b/keystoneclient/auth/identity/v3.py
index cd4f9c5..99d7562 100644
--- a/keystoneclient/auth/identity/v3.py
+++ b/keystoneclient/auth/identity/v3.py
@@ -73,9 +73,13 @@ class Auth(base.BaseIdentityPlugin):
headers = {'Accept': 'application/json'}
body = {'auth': {'identity': {}}}
ident = body['auth']['identity']
+ rkwargs = {}
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[name] = auth_data
@@ -112,7 +116,7 @@ class Auth(base.BaseIdentityPlugin):
_logger.debug('Making authentication request to %s', self.token_url)
resp = session.post(self.token_url, json=body, headers=headers,
- authenticated=False, log=False)
+ authenticated=False, log=False, **rkwargs)
try:
resp_data = resp.json()['token']