Merge pull request #1338 from alopropoz/extra_vars_override

Vars specified via CLI have the highest priority.
This commit is contained in:
Michael DeHaan 2012-10-20 07:29:12 -07:00
commit ed9f5eed09
2 changed files with 10 additions and 9 deletions

View file

@ -189,9 +189,8 @@ class Play(object):
else:
raise errors.AnsibleError("'vars_prompt' section is malformed, see docs")
results = self.playbook.extra_vars.copy()
results.update(vars)
return results
vars.update(self.playbook.extra_vars)
return vars
# *************************************************