1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #1304 from dhozac/vars_files-process-whole-list

Keep processing the rest of the vars_files even if one has vars
This commit is contained in:
Michael DeHaan 2012-10-11 14:56:41 -07:00
commit 89f8562df9

View file

@ -306,7 +306,7 @@ class Play(object):
filename3 = utils.template(self.basedir, filename2, self.playbook.SETUP_CACHE[host]) filename3 = utils.template(self.basedir, filename2, self.playbook.SETUP_CACHE[host])
filename4 = utils.path_dwim(self.basedir, filename3) filename4 = utils.path_dwim(self.basedir, filename3)
if self._has_vars_in(filename4): if self._has_vars_in(filename4):
return continue
new_vars = utils.parse_yaml_from_file(filename4) new_vars = utils.parse_yaml_from_file(filename4)
if new_vars: if new_vars:
if type(new_vars) != dict: if type(new_vars) != dict: