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

Merge pull request #9640 from hkariti/premature_template_playbook_vars

Browse source 
Don't template play vars by themselves, it's too early
This commit is contained in:
Toshio Kuratomi 2014-11-26 10:54:29 -08:00
commit 0752549f02
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,13 +88,6 @@ class Play(object):
if self.playbook.inventory.src() is not None: if self.playbook.inventory.src() is not None:
load_vars['inventory_file'] = self.playbook.inventory.src() load_vars['inventory_file'] = self.playbook.inventory.src()
# template the play vars with themselves and the extra vars
# from the playbook, to make sure they're correct
all_vars = utils.combine_vars(self.vars, self.playbook.extra_vars)
all_vars = utils.combine_vars(all_vars, load_vars)
self.vars = template(basedir, self.vars, all_vars)
self.vars = utils.combine_vars(self.vars, load_vars)
# We first load the vars files from the datastructure # We first load the vars files from the datastructure
# so we have the default variables to pass into the roles # so we have the default variables to pass into the roles
self.vars_files = ds.get('vars_files', []) self.vars_files = ds.get('vars_files', [])