openstack
/
os-client-config
Code Issues Proposed changes

Merge "Revert "Revert "Use interface not endpoint_type for keystoneclient"""

This commit is contained in:
Jenkins 2017-05-25 23:10:41 +00:00 committed by Gerrit Code Review
parent 2f377fc9f7 a483534123
commit fe39a9f020
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
os_client_config/cloud_config.py
View File

@ -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):

2
os_client_config/tests/test_cloud_config.py
View File

@ -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',