mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
Allow module args as k=v pairs when using the module: option with local_action
This task format is valid in 1.x, but was broken in 2.x:
- local_action:
module: shell echo "hello world"
This commit is contained in:
@@ -222,18 +222,21 @@ class ModuleArgsParser:
|
|||||||
action = None
|
action = None
|
||||||
args = None
|
args = None
|
||||||
|
|
||||||
|
actions_allowing_raw = ('command', 'shell', 'script', 'raw')
|
||||||
if isinstance(thing, dict):
|
if isinstance(thing, dict):
|
||||||
# form is like: copy: { src: 'a', dest: 'b' } ... common for structured (aka "complex") args
|
# form is like: copy: { src: 'a', dest: 'b' } ... common for structured (aka "complex") args
|
||||||
thing = thing.copy()
|
thing = thing.copy()
|
||||||
if 'module' in thing:
|
if 'module' in thing:
|
||||||
action = thing['module']
|
action, module_args = self._split_module_string(thing['module'])
|
||||||
args = thing.copy()
|
args = thing.copy()
|
||||||
|
check_raw = action in actions_allowing_raw
|
||||||
|
args.update(parse_kv(module_args, check_raw=check_raw))
|
||||||
del args['module']
|
del args['module']
|
||||||
|
|
||||||
elif isinstance(thing, string_types):
|
elif isinstance(thing, string_types):
|
||||||
# form is like: copy: src=a dest=b ... common shorthand throughout ansible
|
# form is like: copy: src=a dest=b ... common shorthand throughout ansible
|
||||||
(action, args) = self._split_module_string(thing)
|
(action, args) = self._split_module_string(thing)
|
||||||
check_raw = action in ('command', 'shell', 'script', 'raw')
|
check_raw = action in actions_allowing_raw
|
||||||
args = parse_kv(args, check_raw=check_raw)
|
args = parse_kv(args, check_raw=check_raw)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user