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

Fixes to variable issues introduced by recent changes

Browse source 
Fixes #6801
Fixes #6832
This commit is contained in:
James Cammarata 2014-04-02 19:46:51 -05:00
parent 2fd6d16f99
commit 317c2f4bc0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -688,6 +688,9 @@ class Play(object):
else: else:
raise errors.AnsibleError("'vars_prompt' section is malformed, see docs") raise errors.AnsibleError("'vars_prompt' section is malformed, see docs")
if type(self.playbook.extra_vars) == dict:
vars = utils.combine_vars(vars, self.playbook.extra_vars)
return vars return vars
# ************************************************* # *************************************************
@ -766,7 +769,8 @@ class Play(object):
if host is not None: if host is not None:
inject = {} inject = {}
inject.update(self.playbook.inventory.get_variables(host, vault_password=vault_password)) inject.update(self.playbook.inventory.get_variables(host, vault_password=vault_password))
inject.update(self.playbook.VARS_CACHE[host]) inject.update(self.playbook.SETUP_CACHE.get(host, {}))
inject.update(self.playbook.VARS_CACHE.get(host, {}))
for filename in self.vars_files: for filename in self.vars_files: