diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-30 14:25:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-30 14:25:30 +0000 |
| commit | cdb47d9646236e19208b7e49ffc6c7d42000dd89 (patch) | |
| tree | 79b13829e2e71276f5203d60f5a39f56296779ef | |
| parent | 118210da86dfa2aed10b19566b2084d29ae9ec9a (diff) | |
| parent | b398841ebf1bb8acd0fea7c88dae613dad788d08 (diff) | |
| download | python-ceilometerclient-cdb47d9646236e19208b7e49ffc6c7d42000dd89.tar.gz | |
Merge "Token will be lost when constructing a ceilometer client"2.1.0
| -rw-r--r-- | ceilometerclient/client.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index d98443e..f0fc469 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -331,7 +331,9 @@ def _adjust_kwargs(kwargs): } client_kwargs.update(kwargs) - client_kwargs['token'] = kwargs.get('token') or kwargs.get('auth_token') + client_kwargs['token'] = (client_kwargs.get('token') or + kwargs.get('token') or + kwargs.get('auth_token')) timeout = kwargs.get('timeout') if timeout is not None: |