Ensure complex_args is considered in all action_plugins

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

View file

@ -53,7 +53,10 @@ class ActionModule(object):
# flag, it always runs
hosts = ', '.join(self.runner.host_set)
args = parse_kv(template(self.runner.basedir, module_args, inject))
args = {}
if complex_args:
args.update(complex_args)
args.update(parse_kv(template(self.runner.basedir, module_args, inject)))
# Are 'minutes' or 'seconds' keys that exist in 'args'?
if 'minutes' in args or 'seconds' in args: