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

Clean up some extra_vars redundancy

Browse source
This commit is contained in:
Daniel Hokka Zakrisson 2013-02-11 23:25:50 +01:00
parent 57cac788fb
commit 57e51f7fdf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/play.py
View file

@ -184,9 +184,6 @@ class Play(object):
else: else:
vars.update(self.vars) vars.update(self.vars)
if type(self.playbook.extra_vars) == dict:
vars.update(self.playbook.extra_vars)
if type(self.vars_prompt) == list: if type(self.vars_prompt) == list:
for var in self.vars_prompt: for var in self.vars_prompt:
if not 'name' in var: if not 'name' in var:
@ -218,9 +215,10 @@ 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")
results = self.playbook.extra_vars.copy() if type(self.playbook.extra_vars) == dict:
results.update(vars) vars.update(self.playbook.extra_vars)
return results
return vars
# ************************************************* # *************************************************