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

Merge pull request #455 from dhozac/vars_files-non-list

Browse source 
Expand vars_files identically for lists and non-lists
This commit is contained in:
Michael DeHaan 2012-06-08 12:19:47 -07:00
commit c1b02d7805
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/playbook/play.py
View file

@ -186,9 +186,10 @@ class Play(object):
else:
fpath = utils.path_dwim(self.playbook.basedir, utils.template(filename, self.vars))
filename2 = utils.template(filename, self.playbook.SETUP_CACHE[host])
filename2 = utils.template(filename2, self.vars)
fpath = utils.path_dwim(self.playbook.basedir, filename2)
new_vars = utils.parse_yaml_from_file(fpath)
if new_vars:
self.playbook.SETUP_CACHE[host].update(new_vars)
#else: could warn if vars file contains no vars.