diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-27 00:45:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-27 00:45:20 +0000 |
| commit | 479b1cc76f5b02d93e2cb801ffb7ce278cfced52 (patch) | |
| tree | 3b229e0cbcae40efdb2cffdd678331eddc515830 /ceilometerclient | |
| parent | e65d174ceb4b0c76d8ef93194e27f3bf262f4e86 (diff) | |
| parent | 43fa4c3abeac05cf1ca3b173cc5939ec89d8a8fc (diff) | |
| download | python-ceilometerclient-479b1cc76f5b02d93e2cb801ffb7ce278cfced52.tar.gz | |
Merge "Ensure metering is the default service_type"
Diffstat (limited to 'ceilometerclient')
| -rw-r--r-- | ceilometerclient/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 893d63d..d98443e 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, |