summaryrefslogtreecommitdiff
path: root/ceilometerclient
diff options
context:
space:
mode:
authorZhiQiang Fan <zhiqiang.fan@huawei.com>2015-04-02 16:10:25 +0800
committerMehdi Abaakouk <mehdi.abaakouk@enovance.com>2015-04-14 16:33:18 +0200
commitbfb6d122fa99d94a61aea4432f74cbbf3f5d03cc (patch)
tree21351d619c84b904d77abbb8588324155c7be981 /ceilometerclient
parent36f1eedd2285a1b3ca0a5d0f828d4f41f54c5f25 (diff)
downloadpython-ceilometerclient-bfb6d122fa99d94a61aea4432f74cbbf3f5d03cc.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
Diffstat (limited to 'ceilometerclient')
-rw-r--r--ceilometerclient/client.py2
-rw-r--r--ceilometerclient/tests/unit/test_client.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index f3431bf..31ac1f0 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -180,6 +180,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
@@ -316,6 +317,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/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py
index 2433492..0ccec63 100644
--- a/ceilometerclient/tests/unit/test_client.py
+++ b/ceilometerclient/tests/unit/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,