diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-04 20:47:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-04 20:47:28 +0000 |
| commit | 7ca4a168874333546616d28e5cb2264f95b893af (patch) | |
| tree | 0c3f1dd746a7a09686e319b3f7a069f29f705328 | |
| parent | f92b607b0ec2deb18c1b931d57d245d537bb6276 (diff) | |
| parent | dbf003ac6f39279cf1685d82b70d50a798d8b445 (diff) | |
| download | python-ceilometerclient-7ca4a168874333546616d28e5cb2264f95b893af.tar.gz | |
Merge "Support os-endpoint-type"
| -rw-r--r-- | ceilometerclient/client.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 8762a98..620fe54 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -133,7 +133,7 @@ def _get_endpoint(ks_session, **kwargs): service_type = kwargs.get('service_type') or 'metering' endpoint = ks_session.get_endpoint(service_type=service_type, - endpoint_type=endpoint_type, + interface=endpoint_type, region_name=kwargs.get('region_name')) return endpoint @@ -174,7 +174,8 @@ class AuthPlugin(auth.BaseAuthPlugin): 'cacert': self.opts.get('cacert'), 'cert': self.opts.get('cert'), 'key': self.opts.get('key'), - 'insecure': self.opts.get('insecure') + 'insecure': self.opts.get('insecure'), + 'endpoint_type': self.opts.get('endpoint_type'), } # retrieve session |