Fixing bug in which playbook vars were not merged properly

This occurred when a hash would be passed in via extra args and the
hash variable behavior was set to 'merge', which resulted in the
variable from extra args replacing the playbook variable.
pull/4420/head
James Cammarata 2014-02-20 15:24:16 -05:00
parent d158ec382c
commit fa1ab231c9
1 changed files with 1 additions and 1 deletions

View File

@ -649,7 +649,7 @@ class Play(object):
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: if type(self.playbook.extra_vars) == dict:
vars.update(self.playbook.extra_vars) vars = utils.combine_vars(vars, self.playbook.extra_vars)
return vars return vars