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

inventory plugin inventory parameter take precedence over env vars

Browse Source
This commit is contained in:
Chris Meyers 2020-08-05 12:06:37 -04:00 committed by Ryan Petrello
parent 48fb1e973c
commit d518891520
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1464,8 +1464,9 @@ class gce(PluginFileInjector):
def inventory_as_dict(self, inventory_update, private_data_dir):
ret = super().inventory_as_dict(inventory_update, private_data_dir)
credential = inventory_update.get_cloud_credential()
# TODO: Align precedence of ENV vs. inventory config w/ Ansible behavior
ret['projects'] = [credential.get_input('project', default='')]
# InventorySource.source_vars take precedence over ENV vars
if 'projects' not in ret:
ret['projects'] = [credential.get_input('project', default='')]
return ret