Merge "Ignores endpoint_type if interface is provided"

2015-11-26 23:33:02 +00:00
parent 7a3da84d0c 6736ac66b1
commit 0ef99bb9b2
1 changed files with 2 additions and 2 deletions
--- 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),