cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #235 from skvidal/devel

Browse source 
fix for issue #230 - handle template taking 3  args
This commit is contained in:
Michael DeHaan 2012-04-25 09:05:55 -07:00
commit bb1d72f2b4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/playbook.py
View file

@ -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)

4
lib/ansible/utils.py
View file

@ -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)