From bfb6d122fa99d94a61aea4432f74cbbf3f5d03cc Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Thu, 2 Apr 2015 16:10:25 +0800 Subject: [PATCH] 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 --- ceilometerclient/client.py | 2 ++ ceilometerclient/tests/unit/test_client.py | 1 + 2 files changed, 3 insertions(+) diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index f3431bf6..31ac1f0a 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 2433492e..0ccec638 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,