Commit 8457cf43 by Michael DeHaan

Update pause module to not use utils.template

parent a05361f5
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
from ansible.callbacks import vv from ansible.callbacks import vv
from ansible.errors import AnsibleError as ae from ansible.errors import AnsibleError as ae
from ansible.runner.return_data import ReturnData from ansible.runner.return_data import ReturnData
from ansible.utils import getch, template, parse_kv from ansible.utils import getch, parse_kv
import ansible.utils.template as template
from termios import tcflush, TCIFLUSH from termios import tcflush, TCIFLUSH
import datetime import datetime
import sys import sys
...@@ -56,7 +57,8 @@ class ActionModule(object): ...@@ -56,7 +57,8 @@ class ActionModule(object):
args = {} args = {}
if complex_args: if complex_args:
args.update(complex_args) args.update(complex_args)
args.update(parse_kv(template(self.runner.basedir, module_args, inject))) # extra template call unneeded?
args.update(parse_kv(template.template(self.runner.basedir, module_args, inject)))
# Are 'minutes' or 'seconds' keys that exist in 'args'? # Are 'minutes' or 'seconds' keys that exist in 'args'?
if 'minutes' in args or 'seconds' in args: if 'minutes' in args or 'seconds' in args:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment