diff options
| author | ZhiQiang Fan <zhiqiang.fan@huawei.com> | 2015-04-02 16:10:25 +0800 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2015-04-20 13:53:47 -0400 |
| commit | e1439f5c726174d0ac69e328fe9ef760e00fdb4a (patch) | |
| tree | 3960cf595b7293663a1c9e758c3ec947fff32ac7 | |
| parent | 7d7e4b878215c609653989a1ab5e9257b34ee5c6 (diff) | |
| download | python-ceilometerclient-e1439f5c726174d0ac69e328fe9ef760e00fdb4a.tar.gz | |
add region_name to auth plugin parameters
If endpoint is not specified, then auth plugin will request to keystone
to get target endpoint, however, we don't provide region name for it,
this will cause critical issue in multiple region scenario.
Change-Id: I99ceafec25072988435018ca1affbd778ca9b22f
Closes-Bug: #1439553
(cherry picked from commit bfb6d122fa99d94a61aea4432f74cbbf3f5d03cc)
| -rw-r--r-- | ceilometerclient/client.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/tests/test_client.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index c249a88..78b4059 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -179,6 +179,7 @@ class AuthPlugin(auth.BaseAuthPlugin): 'insecure': strutils.bool_from_string( self.opts.get('insecure')), 'endpoint_type': self.opts.get('endpoint_type'), + 'region_name': self.opts.get('region_name'), } # retrieve session @@ -315,6 +316,7 @@ def get_auth_plugin(endpoint, **kwargs): token=kwargs.get('token'), endpoint_type=kwargs.get('endpoint_type'), insecure=kwargs.get('insecure'), + region_name=kwargs.get('region_name'), cacert=kwargs.get('cacert'), tenant_id=kwargs.get('project_id') or kwargs.get('tenant_id'), endpoint=endpoint, diff --git a/ceilometerclient/tests/test_client.py b/ceilometerclient/tests/test_client.py index 8297dad..b5ec4c3 100644 --- a/ceilometerclient/tests/test_client.py +++ b/ceilometerclient/tests/test_client.py @@ -81,6 +81,7 @@ class ClientTest(utils.BaseTestCase): 'service_type': None, 'token': '1234', 'endpoint_type': None, + 'region_name': None, 'auth_url': 'http://no.where', 'tenant_id': None, 'insecure': None, |