summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ceilometerclient/client.py4
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: