diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-25 23:10:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-25 23:10:41 +0000 |
| commit | fe39a9f020bca4be0d0e4a644ff60e402a106612 (patch) | |
| tree | 9199f9198a81fa7ca70a7a7f2d1e4f9285a3fc11 | |
| parent | 2f377fc9f7df7f7532ef984c11bc1bfa5eb3c6a7 (diff) | |
| parent | a483534123640eca2bcbf7c06920be3a2a01b090 (diff) | |
| download | os-client-config-fe39a9f020bca4be0d0e4a644ff60e402a106612.tar.gz | |
Merge "Revert "Revert "Use interface not endpoint_type for keystoneclient"""
| -rw-r--r-- | os_client_config/cloud_config.py | 23 | ||||
| -rw-r--r-- | os_client_config/tests/test_cloud_config.py | 2 |
2 files changed, 14 insertions, 11 deletions
diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index 5f7a34b..9c6b5a5 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -370,12 +370,6 @@ class CloudConfig(object): service_key, min_version=min_version, max_version=max_version) endpoint_override = self.get_endpoint(service_key) - if not interface_key: - if service_key in ('image', 'key-manager'): - interface_key = 'interface' - else: - interface_key = 'endpoint_type' - if service_key == 'object-store': constructor_kwargs = dict( session=self.get_session(), @@ -408,10 +402,6 @@ class CloudConfig(object): if not endpoint_override: constructor_kwargs['endpoint_override'] = endpoint constructor_kwargs.update(kwargs) - if service_key == 'object-store': - constructor_kwargs['os_options'][interface_key] = interface - else: - constructor_kwargs[interface_key] = interface if pass_version_arg and service_key != 'object-store': if not version: version = self.get_api_version(service_key) @@ -455,6 +445,19 @@ class CloudConfig(object): constructor_kwargs['username'] = None constructor_kwargs['password'] = None + if not interface_key: + if service_key in ('image', 'key-manager'): + interface_key = 'interface' + elif (service_key == 'identity' + and version and version.startswith('3')): + interface_key = 'interface' + else: + interface_key = 'endpoint_type' + if service_key == 'object-store': + constructor_kwargs['os_options'][interface_key] = interface + else: + constructor_kwargs[interface_key] = interface + return client_class(**constructor_kwargs) def get_cache_expiration_time(self): diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py index 3ec7ecf..8135526 100644 --- a/os_client_config/tests/test_cloud_config.py +++ b/os_client_config/tests/test_cloud_config.py @@ -570,7 +570,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', |