Merge "Token will be lost when constructing a ceilometer client"

2015-11-30 14:25:30 +00:00
parent 118210da86 b398841ebf
commit cdb47d9646
1 changed files with 3 additions and 1 deletions
--- 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: