External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix lint

Browse Source
This commit is contained in:
VGU
2020-12-13 19:05:29 +01:00
parent bfb00aecbe
commit e35f1afd57
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/models/credential/injectors.py
View File

@@ -83,17 +83,6 @@ def _openstack_data(cred):
openstack_auth['domain_name'] = cred.get_input('domain', default='') openstack_auth['domain_name'] = cred.get_input('domain', default='')
verify_state = cred.get_input('verify_ssl', default=True) 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 = { openstack_data = {
'clouds': { 'clouds': {
'devstack': { 'devstack': {

1
awx/main/tests/unit/test_tasks.py
View File

@@ -292,6 +292,7 @@ def test_openstack_client_config_generation_with_project_region_name(mocker, sou
} }
} }
@pytest.mark.parametrize("source,expected", [ @pytest.mark.parametrize("source,expected", [
(False, False), (True, True) (False, False), (True, True)
]) ])