summaryrefslogtreecommitdiff
path: root/lib/ansible/parsing/mod_args.py
diff options
context:
space:
mode:
authorMatt Davis <nitzmahone@users.noreply.github.com>2016-09-15 11:25:56 -0700
committerGitHub <noreply@github.com>2016-09-15 11:25:56 -0700
commitf497d771c8bda7874382bbffbf641eaedf015f94 (patch)
treeed5f39dfb0f54d6b24cd26c09913ededce7312b6 /lib/ansible/parsing/mod_args.py
parent81072fcba10d6436babe3e0cd7525f857143a985 (diff)
downloadansible-f497d771c8bda7874382bbffbf641eaedf015f94.tar.gz
win_shell/win_command changes + tests (#17557)
Diffstat (limited to 'lib/ansible/parsing/mod_args.py')
-rw-r--r--lib/ansible/parsing/mod_args.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/ansible/parsing/mod_args.py b/lib/ansible/parsing/mod_args.py
index dbe85b0bad..a311156ae9 100644
--- a/lib/ansible/parsing/mod_args.py
+++ b/lib/ansible/parsing/mod_args.py
@@ -29,7 +29,9 @@ from ansible.template import Templar
# For filtering out modules correctly below
RAW_PARAM_MODULES = ([
'command',
+ 'win_command',
'shell',
+ 'win_shell',
'script',
'include',
'include_vars',
@@ -161,7 +163,7 @@ class ModuleArgsParser:
# only internal variables can start with an underscore, so
# we don't allow users to set them directy in arguments
- if args and action not in ('command', 'shell', 'script', 'raw'):
+ if args and action not in ('command', 'win_command', 'shell', 'win_shell', 'script', 'raw'):
for arg in args:
if arg.startswith('_ansible_'):
raise AnsibleError("invalid parameter specified for action '%s': '%s'" % (action, arg))
@@ -191,7 +193,7 @@ class ModuleArgsParser:
args = thing
elif isinstance(thing, string_types):
# form is like: local_action: copy src=a dest=b ... pretty common
- check_raw = action in ('command', 'shell', 'script', 'raw')
+ check_raw = action in ('command', 'win_command', 'shell', 'win_shell', 'script', 'raw')
args = parse_kv(thing, check_raw=check_raw)
elif thing is None:
# this can happen with modules which take no params, like ping:
@@ -217,7 +219,7 @@ class ModuleArgsParser:
action = None
args = None
- actions_allowing_raw = ('command', 'shell', 'script', 'raw')
+ actions_allowing_raw = ('command', 'win_command', 'shell', 'win_shell', 'script', 'raw')
if isinstance(thing, dict):
# form is like: copy: { src: 'a', dest: 'b' } ... common for structured (aka "complex") args
thing = thing.copy()