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

Remove Ansible config override to validate group names (#13837)

Browse Source
This commit is contained in:
Alan Rominger
2023-04-25 13:37:13 -04:00
committed by GitHub
parent 0a13762f11
commit 7acc0067f5
10 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/inventory.py
View File

@@ -1479,8 +1479,6 @@ class PluginFileInjector(object):
def build_env(self, inventory_update, env, private_data_dir, private_data_files): def build_env(self, inventory_update, env, private_data_dir, private_data_files):
injector_env = self.get_plugin_env(inventory_update, private_data_dir, private_data_files) injector_env = self.get_plugin_env(inventory_update, private_data_dir, private_data_files)
env.update(injector_env) env.update(injector_env)
# Preserves current behavior for Ansible change in default planned for 2.10
env['ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS'] = 'never'
# All CLOUD_PROVIDERS sources implement as inventory plugin from collection # All CLOUD_PROVIDERS sources implement as inventory plugin from collection
env['ANSIBLE_INVENTORY_ENABLED'] = 'auto' env['ANSIBLE_INVENTORY_ENABLED'] = 'auto'
return env return env

3
awx/main/tests/data/inventory/plugins/azure_rm/env.json
View File

@@ -1,9 +1,8 @@
{ {
"ANSIBLE_JINJA2_NATIVE": "True", "ANSIBLE_JINJA2_NATIVE": "True",
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"AZURE_CLIENT_ID": "fooo", "AZURE_CLIENT_ID": "fooo",
"AZURE_CLOUD_ENVIRONMENT": "fooo", "AZURE_CLOUD_ENVIRONMENT": "fooo",
"AZURE_SECRET": "fooo", "AZURE_SECRET": "fooo",
"AZURE_SUBSCRIPTION_ID": "fooo", "AZURE_SUBSCRIPTION_ID": "fooo",
"AZURE_TENANT": "fooo" "AZURE_TENANT": "fooo"
} }

3
awx/main/tests/data/inventory/plugins/controller/env.json
View File

@@ -1,5 +1,4 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"TOWER_HOST": "https://foo.invalid", "TOWER_HOST": "https://foo.invalid",
"TOWER_PASSWORD": "fooo", "TOWER_PASSWORD": "fooo",
"TOWER_USERNAME": "fooo", "TOWER_USERNAME": "fooo",
@@ -10,4 +9,4 @@
"CONTROLLER_USERNAME": "fooo", "CONTROLLER_USERNAME": "fooo",
"CONTROLLER_OAUTH_TOKEN": "", "CONTROLLER_OAUTH_TOKEN": "",
"CONTROLLER_VERIFY_SSL": "False" "CONTROLLER_VERIFY_SSL": "False"
} }

3
awx/main/tests/data/inventory/plugins/ec2/env.json
View File

@@ -1,8 +1,7 @@
{ {
"ANSIBLE_JINJA2_NATIVE": "True", "ANSIBLE_JINJA2_NATIVE": "True",
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"AWS_ACCESS_KEY_ID": "fooo", "AWS_ACCESS_KEY_ID": "fooo",
"AWS_SECRET_ACCESS_KEY": "fooo", "AWS_SECRET_ACCESS_KEY": "fooo",
"AWS_SECURITY_TOKEN": "fooo", "AWS_SECURITY_TOKEN": "fooo",
"AWS_SESSION_TOKEN": "fooo" "AWS_SESSION_TOKEN": "fooo"
} }

1
awx/main/tests/data/inventory/plugins/gce/env.json
View File

@@ -1,6 +1,5 @@
{ {
"ANSIBLE_JINJA2_NATIVE": "True", "ANSIBLE_JINJA2_NATIVE": "True",
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"GCE_CREDENTIALS_FILE_PATH": "{{ file_reference }}", "GCE_CREDENTIALS_FILE_PATH": "{{ file_reference }}",
"GOOGLE_APPLICATION_CREDENTIALS": "{{ file_reference }}", "GOOGLE_APPLICATION_CREDENTIALS": "{{ file_reference }}",
"GCP_AUTH_KIND": "serviceaccount", "GCP_AUTH_KIND": "serviceaccount",

3
awx/main/tests/data/inventory/plugins/insights/env.json
View File

@@ -1,5 +1,4 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"INSIGHTS_USER": "fooo", "INSIGHTS_USER": "fooo",
"INSIGHTS_PASSWORD": "fooo" "INSIGHTS_PASSWORD": "fooo"
} }

3
awx/main/tests/data/inventory/plugins/openstack/env.json
View File

@@ -1,4 +1,3 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"OS_CLIENT_CONFIG_FILE": "{{ file_reference }}" "OS_CLIENT_CONFIG_FILE": "{{ file_reference }}"
} }

3
awx/main/tests/data/inventory/plugins/rhv/env.json
View File

@@ -1,7 +1,6 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"OVIRT_INI_PATH": "{{ file_reference }}", "OVIRT_INI_PATH": "{{ file_reference }}",
"OVIRT_PASSWORD": "fooo", "OVIRT_PASSWORD": "fooo",
"OVIRT_URL": "https://foo.invalid", "OVIRT_URL": "https://foo.invalid",
"OVIRT_USERNAME": "fooo" "OVIRT_USERNAME": "fooo"
} }

3
awx/main/tests/data/inventory/plugins/satellite6/env.json
View File

@@ -1,6 +1,5 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"FOREMAN_PASSWORD": "fooo", "FOREMAN_PASSWORD": "fooo",
"FOREMAN_SERVER": "https://foo.invalid", "FOREMAN_SERVER": "https://foo.invalid",
"FOREMAN_USER": "fooo" "FOREMAN_USER": "fooo"
} }

3
awx/main/tests/data/inventory/plugins/vmware/env.json
View File

@@ -1,7 +1,6 @@
{ {
"ANSIBLE_TRANSFORM_INVALID_GROUP_CHARS": "never",
"VMWARE_HOST": "https://foo.invalid", "VMWARE_HOST": "https://foo.invalid",
"VMWARE_PASSWORD": "fooo", "VMWARE_PASSWORD": "fooo",
"VMWARE_USER": "fooo", "VMWARE_USER": "fooo",
"VMWARE_VALIDATE_CERTS": "False" "VMWARE_VALIDATE_CERTS": "False"
} }