From e93518a030c1af1af156b4aa39e259347faf01f5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Fri, 12 Feb 2021 16:44:19 -0500
Subject: [PATCH] Fix Openstack credential region implementation.

The injector wasn't using the same variable name as the model.
---
 awx/main/models/credential/injectors.py                       | 4 ++--
 .../data/inventory/plugins/openstack/files/file_reference     | 1 +
 awx/main/tests/unit/test_tasks.py                             | 4 ++--
 .../src/screens/Credential/shared/data.credentialTypes.json   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/awx/main/models/credential/injectors.py b/awx/main/models/credential/injectors.py
index ef30b91945..90615f2d66 100644
--- a/awx/main/models/credential/injectors.py
+++ b/awx/main/models/credential/injectors.py
@@ -92,8 +92,8 @@ def _openstack_data(cred):
         },
     }
 
-    if cred.has_input('project_region_name'):
-        openstack_data['clouds']['devstack']['region_name'] = cred.get_input('project_region_name', default='')
+    if cred.has_input('region'):
+        openstack_data['clouds']['devstack']['region_name'] = cred.get_input('region', default='')
 
     return openstack_data
 
diff --git a/awx/main/tests/data/inventory/plugins/openstack/files/file_reference b/awx/main/tests/data/inventory/plugins/openstack/files/file_reference
index c578942ca1..4e1d1c6a02 100644
--- a/awx/main/tests/data/inventory/plugins/openstack/files/file_reference
+++ b/awx/main/tests/data/inventory/plugins/openstack/files/file_reference
@@ -8,4 +8,5 @@ clouds:
       project_name: fooo
       username: fooo
     private: true
+    region_name: fooo
     verify: false
diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py
index 166ea95f19..ceb2c7186f 100644
--- a/awx/main/tests/unit/test_tasks.py
+++ b/awx/main/tests/unit/test_tasks.py
@@ -249,7 +249,7 @@ def test_openstack_client_config_generation_with_project_domain_name(mocker, sou
 @pytest.mark.parametrize("source,expected", [
     (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()
     credential_type = CredentialType.defaults['openstack']()
     inputs = {
@@ -259,7 +259,7 @@ def test_openstack_client_config_generation_with_project_region_name(mocker, sou
         'project': 'demo-project',
         'domain': 'my-demo-domain',
         'project_domain_name': 'project-domain',
-        'project_region_name': 'region-name',
+        'region': 'region-name',
     }
     if source is not None:
         inputs['verify_ssl'] = source
diff --git a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
index 6281f15024..d3e048dbd7 100644
--- a/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
+++ b/awx/ui_next/src/screens/Credential/shared/data.credentialTypes.json
@@ -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."
         },
         {
-          "id": "project_region_name",
+          "id": "region",
           "label": "Region Name",
           "type": "string"
         },