From 43fa4c3abeac05cf1ca3b173cc5939ec89d8a8fc Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Thu, 19 Nov 2015 16:50:12 +0100 Subject: [PATCH] Ensure metering is the default service_type Change-Id: Ia5e924eb58aac7fd53e9fe4a3dbdee102ece3ad7 --- ceilometerclient/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 652d2d9c..e25ae9f1 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -456,7 +456,7 @@ def _construct_http_client(**kwargs): return SessionClient( session=kwargs.pop('session'), - service_type=kwargs.pop('service_type', 'metering'), + service_type=kwargs.pop('service_type', 'metering') or 'metering', interface=kwargs.pop('interface', kwargs.pop('endpoint_type', 'publicURL')), region_name=kwargs.pop('region_name', None), @@ -510,7 +510,7 @@ class SessionClient(adapter.LegacyJsonAdapter): def request(self, url, method, **kwargs): kwargs.setdefault('headers', kwargs.get('headers', {})) # NOTE(sileht): The standard call raises errors from - # keystoneauth, where we need to raise the gnocchiclient errors. + # keystoneauth, where we need to raise the ceilometerclient errors. raise_exc = kwargs.pop('raise_exc', True) with record_time(self.times, self.timings, method, url): resp, body = super(SessionClient, self).request(url,