External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-27 16:09:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1379 from ryanpetrello/fix-1366

Browse Source 
don't inject custom extra_vars for inventory updates
This commit is contained in:
Ryan Petrello
2018-02-27 17:00:22 -05:00
committed by GitHub
parent 6e39388090 b9ab06734d
commit b5a46c346d
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/credential/__init__.py
View File

@@ -648,6 +648,8 @@ class CredentialType(CommonModelNameNotUnique):
env[env_var] = Template(tmpl).render(**namespace) env[env_var] = Template(tmpl).render(**namespace)
safe_env[env_var] = Template(tmpl).render(**safe_namespace) safe_env[env_var] = Template(tmpl).render(**safe_namespace)
if 'INVENTORY_UPDATE_ID' not in env:
# awx-manage inventory_update does not support extra_vars via -e
extra_vars = {} extra_vars = {}
safe_extra_vars = {} safe_extra_vars = {}
for var_name, tmpl in self.injectors.get('extra_vars', {}).items(): for var_name, tmpl in self.injectors.get('extra_vars', {}).items():