diff options
| author | Monty Taylor <mordred@inaugust.com> | 2017-03-09 09:32:15 -0600 |
|---|---|---|
| committer | Lars Kellogg-Stedman <lars@redhat.com> | 2017-03-09 13:30:03 -0500 |
| commit | 38e5eba621e48d74c05315da2b89e6c801f4c43f (patch) | |
| tree | 0c834d67f3e5b71036a5cd386edca2c6d179039e | |
| parent | 8acef660cdac365ad1d48a2a963093d64a046f09 (diff) | |
| download | os-client-config-38e5eba621e48d74c05315da2b89e6c801f4c43f.tar.gz | |
Use interface not endpoint_type for keystoneclient
keystoneclient wants the interface argument.
Change-Id: I5898d8621259256f962fc006df38049d0cb059f8
| -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 8eae86f..ae74e55 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 ce724cb..3c1ae1f 100644 --- a/os_client_config/tests/test_cloud_config.py +++ b/os_client_config/tests/test_cloud_config.py @@ -529,7 +529,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', @@ -549,7 +549,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', |