From fa4e1bd21db4bee2a0ee779067cdd659e647d7fc Mon Sep 17 00:00:00 2001 From: Paulo Matias Date: Wed, 7 Dec 2016 18:07:37 -0200 Subject: Fix interface_key for identity clients Change-Id: I83870e8b3ee6dc7fdbb6e9d67075cc4c08646e4e Closes-Bug: #1648212 --- os_client_config/cloud_config.py | 2 +- os_client_config/tests/test_cloud_config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index 82442bb..f61c498 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -321,7 +321,7 @@ class CloudConfig(object): endpoint_override = self.get_endpoint(service_key) if not interface_key: - if service_key in ('image', 'key-manager'): + if service_key in ('image', 'key-manager', 'identity'): interface_key = 'interface' else: interface_key = 'endpoint_type' diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py index e3d1d5d..dcbeb3a 100644 --- a/os_client_config/tests/test_cloud_config.py +++ b/os_client_config/tests/test_cloud_config.py @@ -590,7 +590,7 @@ class TestCloudConfig(base.TestCase): mock_client.assert_called_with( version='2.0', endpoint='http://example.com/v2', - endpoint_type='admin', + interface='admin', endpoint_override=None, region_name='region-al', service_type='identity', @@ -610,7 +610,7 @@ class TestCloudConfig(base.TestCase): mock_client.assert_called_with( version='3', endpoint='http://example.com', - endpoint_type='admin', + interface='admin', endpoint_override=None, region_name='region-al', service_type='identity', -- cgit v1.2.1