openstack
/
os-client-config
Code Issues Proposed changes

Revert "Fix interface_key for identity clients" 

This patch breaks stable/newton devstack-gate of shade.

This reverts commit fa4e1bd21d.

Change-Id: I31a7831693f567a0717a9b41c242453fb937d6d7
This commit is contained in:
Monty Taylor 2017-01-18 14:25:53 -06:00
parent cc2b337dcd
commit 3c47e251c9
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
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

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

4
os_client_config/tests/test_cloud_config.py
View File

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