External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 03:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix Openstack credential region implementation.

Browse Source 
The injector wasn't using the same variable name as the model.
This commit is contained in:
Bill Nottingham
2021-02-12 16:44:19 -05:00
parent 67f1f9ac69
commit e93518a030
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,8 @@ def _openstack_data(cred):
}, },
} }
if cred.has_input('project_region_name'): if cred.has_input('region'):
openstack_data['clouds']['devstack']['region_name'] = cred.get_input('project_region_name', default='') openstack_data['clouds']['devstack']['region_name'] = cred.get_input('region', default='')
return openstack_data return openstack_data

1
awx/main/tests/data/inventory/plugins/openstack/files/file_reference
View File

@@ -8,4 +8,5 @@ clouds:
project_name: fooo project_name: fooo
username: fooo username: fooo
private: true private: true
region_name: fooo
verify: false verify: false

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

@@ -249,7 +249,7 @@ def test_openstack_client_config_generation_with_project_domain_name(mocker, sou
@pytest.mark.parametrize("source,expected", [ @pytest.mark.parametrize("source,expected", [
(None, True), (False, False), (True, True) (None, True), (False, False), (True, True)
]) ])
def test_openstack_client_config_generation_with_project_region_name(mocker, source, expected, private_data_dir): def test_openstack_client_config_generation_with_region(mocker, source, expected, private_data_dir):
update = tasks.RunInventoryUpdate() update = tasks.RunInventoryUpdate()
credential_type = CredentialType.defaults['openstack']() credential_type = CredentialType.defaults['openstack']()
inputs = { inputs = {
@@ -259,7 +259,7 @@ def test_openstack_client_config_generation_with_project_region_name(mocker, sou
'project': 'demo-project', 'project': 'demo-project',
'domain': 'my-demo-domain', 'domain': 'my-demo-domain',
'project_domain_name': 'project-domain', 'project_domain_name': 'project-domain',
'project_region_name': 'region-name', 'region': 'region-name',
} }
if source is not None: if source is not None:
inputs['verify_ssl'] = source inputs['verify_ssl'] = source

2
awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
View File

@@ -276,7 +276,7 @@
"help_text": "OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Refer to Ansible Tower documentation for common scenarios." "help_text": "OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Refer to Ansible Tower documentation for common scenarios."
}, },
{ {
"id": "project_region_name", "id": "region",
"label": "Region Name", "label": "Region Name",
"type": "string" "type": "string"
}, },