From 13a591eac077ad594f7a0095a2b144c73ab4177f Mon Sep 17 00:00:00 2001 From: Will Thames Date: Thu, 5 Mar 2015 14:45:24 +1000 Subject: [PATCH] Don't log item data for skipped tasks under no_log Tasks with `no_log` set should not log data. Remove log of item data for skipped tasks in loops Fix for #10387 --- lib/ansible/runner/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index deea14eae21..689166fc466 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -873,9 +873,13 @@ class Runner(object): for cond in self.conditional: 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)) - self.callbacks.on_skipped(host, inject.get('item',None)) - return ReturnData(host=host, result=result) + result = dict(changed=False, skipped=True) + if self.no_log: + 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: handler.setup(module_name, inject)