diff --git a/awx/main/models/credential/injectors.py b/awx/main/models/credential/injectors.py index d7f64b70a9..73cd018393 100644 --- a/awx/main/models/credential/injectors.py +++ b/awx/main/models/credential/injectors.py @@ -83,17 +83,6 @@ def _openstack_data(cred): openstack_auth['domain_name'] = cred.get_input('domain', default='') verify_state = cred.get_input('verify_ssl', default=True) -# if cred.has_input('project_region_name'): -# openstack_data = { -# 'clouds': { -# 'devstack': { -# 'auth': openstack_auth, -# 'verify': verify_state, -# 'region_name': cred.get_input('project_region_name', default='') -# }, -# }, -# } -# else: openstack_data = { 'clouds': { 'devstack': { diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py index 37759a1f36..0a530bef51 100644 --- a/awx/main/tests/unit/test_tasks.py +++ b/awx/main/tests/unit/test_tasks.py @@ -292,6 +292,7 @@ def test_openstack_client_config_generation_with_project_region_name(mocker, sou } } + @pytest.mark.parametrize("source,expected", [ (False, False), (True, True) ])