ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix order of resolving dependent role variables from vars files

Browse source 
Also adds a new class to the test_var_precedence test to check for
this type of error in the future.

Fixes #9178
This commit is contained in:
James Cammarata 2014-10-03 13:30:47 -05:00
commit 0c40c6c23c
5 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -287,7 +287,8 @@ class Play(object):
if os.path.isfile(vars):
vars_data = utils.parse_yaml_from_file(vars, vault_password=self.vault_password)
if vars_data:
dep_vars = utils.combine_vars(vars_data, dep_vars)
#dep_vars = utils.combine_vars(vars_data, dep_vars)
dep_vars = utils.combine_vars(dep_vars, vars_data)
defaults = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'defaults')))
dep_defaults_data = {}
if os.path.isfile(defaults):