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

Expand vars_files identically for lists and non-lists
12 years ago · e8e6c98016
parent 01387520e9 dff8d7be04
commit e8e6c98016
1 changed files with 3 additions and 2 deletions
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@ -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. 
-