diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2015-11-19 16:31:38 +0100 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2015-11-20 08:30:25 +0100 |
| commit | 6736ac66b1bf61a37f48e1a8451fd61622b01bd1 (patch) | |
| tree | 50bc6ec8ef54b21320cba47c7804ff1ba4701413 | |
| parent | 25070cd88eccf10eb66ecd42515d9aa54d940eda (diff) | |
| download | python-ceilometerclient-6736ac66b1bf61a37f48e1a8451fd61622b01bd1.tar.gz | |
Ignores endpoint_type if interface is provided
When a keystone session object is used, if endpoint_type and interface
is provided, we must use interface and drops endpoint_type.
Change-Id: I379e18f684aa5092f8adbeaebe98030053115767
| -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), |