internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure complex_args is considered in all action_plugins

Browse Source
This commit is contained in:
Daniel Hokka Zakrisson
2013-02-28 14:27:42 +01:00
parent 297259725a
commit ae8d6ac303
10 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/runner/action_plugins/template.py
View File

@@ -37,7 +37,10 @@ class ActionModule(object):
raise errors.AnsibleError("in current versions of ansible, templates are only usable in playbooks")
# load up options
options = utils.parse_kv(module_args)
options = {}
if complex_args:
options.update(complex_args)
options.update(utils.parse_kv(module_args))
source = options.get('src', None)
dest = options.get('dest', None)
@@ -106,9 +109,9 @@ class ActionModule(object):
if self.runner.check:
return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), diff=dict(before_header=dest, after_header=source, before=dest_contents, after=resultant))
else:
res = self.runner._execute_module(conn, tmp, 'copy', module_args, inject=inject)
res = self.runner._execute_module(conn, tmp, 'copy', module_args, inject=inject, complex_args=complex_args)
res.diff = dict(before=dest_contents, after=resultant)
return res
else:
return self.runner._execute_module(conn, tmp, 'file', module_args, inject=inject)
return self.runner._execute_module(conn, tmp, 'file', module_args, inject=inject, complex_args=complex_args)