Merge branch 'issue_4129_role_defaults_empty_yaml' into devel
Conflicts: lib/ansible/playbook/play.py
This commit is contained in:
commit
458f71b53c
1 changed files with 5 additions and 1 deletions
|
@ -408,7 +408,11 @@ class Play(object):
|
||||||
else:
|
else:
|
||||||
include_vars[k] = x[k]
|
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)
|
# append the vars defined with the include (from above)
|
||||||
# as well as the old-style 'vars' element. The old-style
|
# as well as the old-style 'vars' element. The old-style
|
||||||
|
|
Loading…
Add table
Reference in a new issue