openstack
/
os-client-config
Code Issues Proposed changes

Use interface not endpoint_type for keystoneclient 

keystoneclient wants the interface argument.

Change-Id: I5898d8621259256f962fc006df38049d0cb059f8
This commit is contained in:
Monty Taylor 2017-03-09 09:32:15 -06:00 committed by Lars Kellogg-Stedman
parent 8acef660cd
commit 38e5eba621
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_client_config/cloud_config.py
View File

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

4
os_client_config/tests/test_cloud_config.py
View File

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