internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-26 08:26:28 +00:00
Code Issues Packages Projects Releases Wiki 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
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:
vars.update(self.vars)
if type(self.playbook.extra_vars) == dict:
vars.update(self.playbook.extra_vars)
if type(self.vars_prompt) == list:
for var in self.vars_prompt:
if not 'name' in var:
@@ -218,9 +215,10 @@ 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
if type(self.playbook.extra_vars) == dict:
vars.update(self.playbook.extra_vars)
return vars
# *************************************************