1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

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.
This commit is contained in:
James Cammarata 2014-02-20 15:24:16 -05:00
parent d158ec382c
commit fa1ab231c9

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