summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornitzmahone <mdavis@ansible.com>2015-08-12 11:15:39 -0700
committernitzmahone <mdavis@ansible.com>2015-08-12 11:15:39 -0700
commitc7fc812c6b48eca421cee5e0f660e1a608d9a184 (patch)
tree7f172489f48984710228306d648116511c7ebbf9
parentbf5353767ea80d31d076a603e333097324fa05af (diff)
downloadansible-c7fc812c6b48eca421cee5e0f660e1a608d9a184.tar.gz
prevent local logging of module args under -vv when no_log specified
-rw-r--r--lib/ansible/runner/action_plugins/normal.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ansible/runner/action_plugins/normal.py b/lib/ansible/runner/action_plugins/normal.py
index 8500c6641c..28b5a70bda 100644
--- a/lib/ansible/runner/action_plugins/normal.py
+++ b/lib/ansible/runner/action_plugins/normal.py
@@ -53,7 +53,12 @@ class ActionModule(object):
module_name = 'command'
module_args += " #USE_SHELL"
- vv("REMOTE_MODULE %s %s" % (module_name, module_args), host=conn.host)
+ if self.runner.no_log:
+ module_display_args = "(no_log enabled, args censored)"
+ else:
+ module_display_args = module_args
+
+ vv("REMOTE_MODULE %s %s" % (module_name, module_display_args), host=conn.host)
return self.runner._execute_module(conn, tmp, module_name, module_args, inject=inject, complex_args=complex_args)