Merge pull request #235 from skvidal/devel

fix for issue #230 - handle template taking 3  args

lib/ansible/playbook.py

@@ -154,7 +154,7 @@ class PlayBook(object):
                 include_vars[k] = v
         inject_vars = play_vars.copy()
         inject_vars.update(include_vars)
-        included = utils.template_from_file(path, inject_vars)
+        included = utils.template_from_file(path, inject_vars, SETUP_CACHE)
         included = utils.parse_yaml(included)
         for x in included:
             if len(include_vars):
@@ -168,7 +168,7 @@ class PlayBook(object):
 
         path = utils.path_dwim(dirname, handler['include'])
         inject_vars = self._get_vars(play, dirname)
-        included = utils.template_from_file(path, inject_vars)
+        included = utils.template_from_file(path, inject_vars, SETUP_CACHE)
         included = utils.parse_yaml(included)
         for x in included:
             new_handlers.append(x)

lib/ansible/utils.py

@@ -249,10 +249,10 @@ def template(text, vars, setup_cache):
 def double_template(text, vars, setup_cache):
     return template(template(text, vars, setup_cache), vars, setup_cache)
 
-def template_from_file(path, vars):
+def template_from_file(path, vars, setup_cache):
     ''' run a file through the templating engine '''
     data = file(path).read()
-    return template(data, vars)
+    return template(data, vars, setup_cache)
 
 def parse_yaml(data):
     return yaml.load(data)