wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10388 from willthames/no_log_skipped

Browse source 
Don't log item data for skipped tasks under no_log
This commit is contained in:
Toshio Kuratomi 2015-03-05 16:34:38 -08:00
commit d706fd1eda
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/runner/__init__.py
View file

@ -873,9 +873,13 @@ class Runner(object):
for cond in self.conditional: for cond in self.conditional:
if not utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars): if not utils.check_conditional(cond, self.basedir, inject, fail_on_undefined=self.error_on_undefined_vars):
result = utils.jsonify(dict(changed=False, skipped=True)) result = dict(changed=False, skipped=True)
self.callbacks.on_skipped(host, inject.get('item',None)) if self.no_log:
return ReturnData(host=host, result=result) result = utils.censor_unlogged_data(result)
self.callbacks.on_skipped(host, result)
else:
self.callbacks.on_skipped(host, inject.get('item',None))
return ReturnData(host=host, result=utils.jsonify(result))
if getattr(handler, 'setup', None) is not None: if getattr(handler, 'setup', None) is not None:
handler.setup(module_name, inject) handler.setup(module_name, inject)