Commit 317c2f4b by James Cammarata

Fixes to variable issues introduced by recent changes

Fixes #6801
Fixes #6832
parent 2fd6d16f
...@@ -688,6 +688,9 @@ class Play(object): ...@@ -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): ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment