cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issue_4129_role_defaults_empty_yaml' into devel

Browse source 
Conflicts:
	lib/ansible/playbook/play.py
This commit is contained in:
James Cammarata 2013-09-16 16:21:06 -05:00
commit 458f71b53c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -408,7 +408,11 @@ class Play(object):
else:
include_vars[k] = x[k]
default_vars = utils.combine_vars(self.default_vars, x.get('default_vars', {}))
default_vars = x.get('default_vars', {})
if not default_vars:
default_vars = self.default_vars
else:
default_vars = utils.combine_vars(self.default_vars, default_vars)
# append the vars defined with the include (from above)
# as well as the old-style 'vars' element. The old-style