diff options
| author | Monty Taylor <mordred@inaugust.com> | 2017-01-18 14:25:53 -0600 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2017-01-18 14:26:34 -0600 |
| commit | 3c47e251c978cf9c5e393f032c0c70d67c1dcb00 (patch) | |
| tree | 069551b5375ac3a42614f91a449a26b483e5a2d5 | |
| parent | cc2b337dcd55d8d2edd53b6000f1dd128636b529 (diff) | |
| download | os-client-config-3c47e251c978cf9c5e393f032c0c70d67c1dcb00.tar.gz | |
This patch breaks stable/newton devstack-gate of shade.
This reverts commit fa4e1bd21db4bee2a0ee779067cdd659e647d7fc.
Change-Id: I31a7831693f567a0717a9b41c242453fb937d6d7
| -rw-r--r-- | os_client_config/cloud_config.py | 2 | ||||
| -rw-r--r-- | 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 ecf60a6..a7fc058 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -318,7 +318,7 @@ class CloudConfig(object): endpoint_override = self.get_endpoint(service_key) if not interface_key: - if service_key in ('image', 'key-manager', 'identity'): + if service_key in ('image', 'key-manager'): 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 f97f85b..6f960e6 100644 --- a/os_client_config/tests/test_cloud_config.py +++ b/os_client_config/tests/test_cloud_config.py @@ -524,7 +524,7 @@ class TestCloudConfig(base.TestCase): mock_client.assert_called_with( version='2.0', endpoint='http://example.com/v2', - interface='admin', + endpoint_type='admin', endpoint_override=None, region_name='region-al', service_type='identity', @@ -544,7 +544,7 @@ class TestCloudConfig(base.TestCase): mock_client.assert_called_with( version='3', endpoint='http://example.com', - interface='admin', + endpoint_type='admin', endpoint_override=None, region_name='region-al', service_type='identity', |