ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-27 18:50:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make inventory variables available to vars_files

Browse source
This commit is contained in:
Daniel Hokka Zakrisson 2013-01-03 23:16:38 +01:00
parent a1877b2213
commit 68f736e8d7
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -244,6 +244,10 @@ class Play(object):
if type(self.vars_files) != list: if type(self.vars_files) != list:
self.vars_files = [ self.vars_files ] self.vars_files = [ self.vars_files ]
if host is not None:
inject = self.playbook.SETUP_CACHE[host].copy()
inject.update(self.playbook.inventory.get_variables(host))
for filename in self.vars_files: for filename in self.vars_files:
if type(filename) == list: if type(filename) == list:
@ -255,7 +259,7 @@ class Play(object):
filename2 = utils.template(self.basedir, real_filename, self.vars) filename2 = utils.template(self.basedir, real_filename, self.vars)
filename3 = filename2 filename3 = filename2
if host is not None: if host is not None:
filename3 = utils.template(self.basedir, filename2, self.playbook.SETUP_CACHE[host]) filename3 = utils.template(self.basedir, filename2, inject)
filename4 = utils.path_dwim(self.basedir, filename3) filename4 = utils.path_dwim(self.basedir, filename3)
sequence.append(filename4) sequence.append(filename4)
if os.path.exists(filename4): if os.path.exists(filename4):
@ -288,7 +292,7 @@ class Play(object):
filename2 = utils.template(self.basedir, filename, self.vars) filename2 = utils.template(self.basedir, filename, self.vars)
filename3 = filename2 filename3 = filename2
if host is not None: if host is not None:
filename3 = utils.template(self.basedir, filename2, self.playbook.SETUP_CACHE[host]) filename3 = utils.template(self.basedir, filename2, inject)
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):
continue continue