diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-10 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-10 19:39:53 +0000 |
| commit | 84d110c63ecf671377d4b2338060e9b00da44a4f (patch) | |
| tree | ba6a9ec1770977f63e43cb0959d23527ae2e421a /swiftclient/client.py | |
| parent | d2ee01bfe4bc8ac864d8f10ef657e6ce45168d9c (diff) | |
| parent | a175689418208e1c72d8db03d6b59893c73b2445 (diff) | |
| download | python-swiftclient-84d110c63ecf671377d4b2338060e9b00da44a4f.tar.gz | |
Merge "Accept token and tenant_id for authenticating against KS"
Diffstat (limited to 'swiftclient/client.py')
| -rw-r--r-- | swiftclient/client.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 8844a53..4367fdc 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -457,6 +457,7 @@ def get_auth_keystone(auth_url, user, key, os_options, **kwargs): _ksclient = ksclient.Client( username=user, password=key, + token=os_options.get('auth_token'), tenant_name=os_options.get('tenant_name'), tenant_id=os_options.get('tenant_id'), user_id=os_options.get('user_id'), |