External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -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

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

@@ -648,27 +648,29 @@ 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)
extra_vars = {} if 'INVENTORY_UPDATE_ID' not in env:
safe_extra_vars = {} # awx-manage inventory_update does not support extra_vars via -e
for var_name, tmpl in self.injectors.get('extra_vars', {}).items(): extra_vars = {}
extra_vars[var_name] = Template(tmpl).render(**namespace) safe_extra_vars = {}
safe_extra_vars[var_name] = Template(tmpl).render(**safe_namespace) for var_name, tmpl in self.injectors.get('extra_vars', {}).items():
extra_vars[var_name] = Template(tmpl).render(**namespace)
safe_extra_vars[var_name] = Template(tmpl).render(**safe_namespace)
def build_extra_vars_file(vars, private_dir): def build_extra_vars_file(vars, private_dir):
handle, path = tempfile.mkstemp(dir = private_dir) handle, path = tempfile.mkstemp(dir = private_dir)
f = os.fdopen(handle, 'w') f = os.fdopen(handle, 'w')
f.write(json.dumps(vars)) f.write(json.dumps(vars))
f.close() f.close()
os.chmod(path, stat.S_IRUSR) os.chmod(path, stat.S_IRUSR)
return path return path
if extra_vars: if extra_vars:
path = build_extra_vars_file(extra_vars, private_data_dir) path = build_extra_vars_file(extra_vars, private_data_dir)
args.extend(['-e', '@%s' % path]) args.extend(['-e', '@%s' % path])
if safe_extra_vars: if safe_extra_vars:
path = build_extra_vars_file(safe_extra_vars, private_data_dir) path = build_extra_vars_file(safe_extra_vars, private_data_dir)
safe_args.extend(['-e', '@%s' % path]) safe_args.extend(['-e', '@%s' % path])
@CredentialType.default @CredentialType.default