From 6ce6b202684e35313deea54f89bbb8e40e48cc79 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 19 Oct 2015 09:07:47 -0700 Subject: [PATCH] Remove auto-added invocation return value as it is not used by v2 and could leak sensitive data. --- lib/ansible/plugins/action/__init__.py | 7 ------- lib/ansible/plugins/callback/log_plays.py | 3 --- 2 files changed, 10 deletions(-) diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 6e3cb6f3f8..561763696d 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -441,13 +441,6 @@ class ActionBase: if 'stdout' in data and 'stdout_lines' not in data: data['stdout_lines'] = data.get('stdout', u'').splitlines() - # store the module invocation details back into the result - if self._task.async != 0: - data['invocation'] = dict( - module_args = module_args, - module_name = module_name, - ) - self._display.debug("done with _execute_module (%s, %s)" % (module_name, module_args)) return data diff --git a/lib/ansible/plugins/callback/log_plays.py b/lib/ansible/plugins/callback/log_plays.py index 532dd607cc..8b82586df9 100644 --- a/lib/ansible/plugins/callback/log_plays.py +++ b/lib/ansible/plugins/callback/log_plays.py @@ -54,10 +54,7 @@ class CallbackModule(CallbackBase): data = 'omitted' else: data = data.copy() - invocation = data.pop('invocation', None) data = json.dumps(data) - if invocation is not None: - data = json.dumps(invocation) + " => %s " % data path = os.path.join("/var/log/ansible/hosts", host) now = time.strftime(self.TIME_FORMAT, time.localtime())