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

Fixing bug in playbook use of default variables in roles

Browse source
This commit is contained in:
James Cammarata 2013-09-01 08:49:41 -05:00
parent e0df5b5888
commit 47a89a57fa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -174,7 +174,7 @@ class Play(object):
if os.path.isfile(defaults):
defs_data = utils.parse_yaml_from_file(defaults)
if defs_data:
role_vars = utils.combine_vars(role_vars, defs_data)
role_vars = utils.combine_vars(defs_data, role_vars)
# the meta directory contains the yaml that should
# hold the list of dependencies (if any)
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(role_path, 'meta')))
@ -207,7 +207,7 @@ class Play(object):
if os.path.isfile(defaults):
defs_data = utils.parse_yaml_from_file(defaults)
if defs_data:
dep_vars = utils.combine_vars(dep_vars, defs_data)
dep_vars = utils.combine_vars(defs_data, dep_vars)
if 'role' in dep_vars:
del dep_vars['role']
self._build_role_dependencies([dep], dep_stack, passed_vars=dep_vars, level=level+1)