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

Update logic to not over write ec2 replace

Browse Source 
* fix replace logic so that we don't over write and stay only at vmware
  when ec2 is selected
* add an env.json for functional testing
This commit is contained in:
thedoubl3j
2025-05-02 10:15:23 -04:00
committed by Adrià Sala
parent 60114ab929
commit eb6aebff00
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1494,8 +1494,11 @@ class PluginFileInjector(object):
if self.base_injector == 'managed': if self.base_injector == 'managed':
from awx.main.models.credential import injectors as builtin_injectors from awx.main.models.credential import injectors as builtin_injectors
cred_kind = inventory_update.source.replace('ec2', 'aws') cred_kind = inventory_update.source
cred_kind = inventory_update.source.replace('vmware_esxi', 'vmware') if cred_kind == 'ec2':
cred_kind = cred_kind.replace('ec2', 'aws')
elif cred_kind == 'vmware_esxi':
cred_kind = cred_kind.replace('vmware_esxi', 'vmware')
if cred_kind in dir(builtin_injectors): if cred_kind in dir(builtin_injectors):
getattr(builtin_injectors, cred_kind)(credential, injected_env, private_data_dir) getattr(builtin_injectors, cred_kind)(credential, injected_env, private_data_dir)
elif self.base_injector == 'template': elif self.base_injector == 'template':

7
awx/main/tests/data/inventory/plugins/vmware_esxi/env.json
View File

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