From bfb00aecbe18d7b3aeadcda03dd28ff8223fdf50 Mon Sep 17 00:00:00 2001 From: VGU Date: Sun, 13 Dec 2020 18:57:13 +0100 Subject: [PATCH] Add project_region_name input --- awx/main/models/credential/__init__.py | 5 +++++ awx/main/models/credential/injectors.py | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index 66db962430..e8a2884083 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -819,6 +819,11 @@ ManagedCredentialType( 'It is only needed for Keystone v3 authentication ' 'URLs. Refer to Ansible Tower documentation for ' 'common scenarios.') + }, { + 'id': 'region', + 'label': ugettext_noop('Region Name'), + 'type': 'string', + 'help_text': ugettext_noop('For some cloud providers, like OVH, region must be specified'), }, { 'id': 'verify_ssl', 'label': ugettext_noop('Verify SSL'), diff --git a/awx/main/models/credential/injectors.py b/awx/main/models/credential/injectors.py index 75d1f17bfe..d7f64b70a9 100644 --- a/awx/main/models/credential/injectors.py +++ b/awx/main/models/credential/injectors.py @@ -82,14 +82,30 @@ def _openstack_data(cred): if cred.has_input('domain'): 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': { 'auth': openstack_auth, - 'verify': verify_state, + 'verify': verify_state }, }, } + + if cred.has_input('project_region_name'): + openstack_data['clouds']['devstack']['region_name'] = cred.get_input('project_region_name', default='') + return openstack_data