diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 23:33:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 23:33:02 +0000 |
| commit | 0ef99bb9b21afff765fe4ffbf7183481b6cf5a33 (patch) | |
| tree | d725e82f20f328459e110e335ed8fd34576cc015 | |
| parent | 7a3da84d0c03ee84ae9e19844ac9c8177e7e78c3 (diff) | |
| parent | 6736ac66b1bf61a37f48e1a8451fd61622b01bd1 (diff) | |
| download | python-ceilometerclient-0ef99bb9b21afff765fe4ffbf7183481b6cf5a33.tar.gz | |
Merge "Ignores endpoint_type if interface is provided"
| -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 82fa967..652d2d9 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -457,8 +457,8 @@ def _construct_http_client(**kwargs): return SessionClient( session=kwargs.pop('session'), service_type=kwargs.pop('service_type', 'metering'), - interface=(kwargs.pop('interface', None) or - kwargs.pop('endpoint_type', 'publicURL')), + interface=kwargs.pop('interface', kwargs.pop('endpoint_type', + 'publicURL')), region_name=kwargs.pop('region_name', None), user_agent=kwargs.pop('user_agent', 'python-ceilometerclient'), auth=kwargs.get('auth', None), |