Fixes to variable issues introduced by recent changes

Fixes ansible#6801 Fixes ansible#6832
dragon3 · Apr 3, 2014 · 317c2f4 · 317c2f4
1 parent 2fd6d16
commit 317c2f4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
@@ -688,6 +688,9 @@ def _get_vars(self):
         else:
             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
 
     # *************************************************
@@ -766,7 +769,8 @@ def _update_vars_files_for_host(self, host, vault_password=None):
         if host is not None:
             inject = {}
             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: