ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix issue with vars precedence from roles

Browse source 
Fixes #9219
This commit is contained in:
James Cammarata 2014-09-30 15:50:46 -05:00
parent c6bfd05c81
commit 313f26f866
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,7 +372,7 @@ class Play(object):
# flush handlers after pre_tasks # flush handlers after pre_tasks
new_tasks.append(dict(meta='flush_handlers')) new_tasks.append(dict(meta='flush_handlers'))
roles = self._build_role_dependencies(roles, [], self.vars) roles = self._build_role_dependencies(roles, [], {})
# give each role an uuid and # give each role an uuid and
# make role_path available as variable to the task # make role_path available as variable to the task

12
lib/ansible/runner/__init__.py
View file

@ -600,6 +600,14 @@ class Runner(object):
module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject) module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject)
module_vars = template.template(self.basedir, self.module_vars, module_vars_inject) module_vars = template.template(self.basedir, self.module_vars, module_vars_inject)
# remove bad variables from the module vars, which may be in there due
# the way role declarations are specified in playbooks
if 'tags' in module_vars:
del module_vars['tags']
if 'when' in module_vars:
del module_vars['when']
# start building the dictionary of injected variables
inject = {} inject = {}
# default vars are the lowest priority # default vars are the lowest priority
@ -608,10 +616,10 @@ class Runner(object):
inject = utils.combine_vars(inject, host_variables) inject = utils.combine_vars(inject, host_variables)
# then the setup_cache which contains facts gathered # then the setup_cache which contains facts gathered
inject = utils.combine_vars(inject, self.setup_cache.get(host, {})) inject = utils.combine_vars(inject, self.setup_cache.get(host, {}))
# then come the module variables
inject = utils.combine_vars(inject, module_vars)
# followed by vars (vars, vars_files, vars/main.yml) # followed by vars (vars, vars_files, vars/main.yml)
inject = utils.combine_vars(inject, self.vars_cache.get(host, {})) inject = utils.combine_vars(inject, self.vars_cache.get(host, {}))
# then come the module variables
inject = utils.combine_vars(inject, module_vars)
# and finally -e vars are the highest priority # and finally -e vars are the highest priority
inject = utils.combine_vars(inject, self.extra_vars) inject = utils.combine_vars(inject, self.extra_vars)
# and then special vars # and then special vars

2
test/integration/roles/test_var_precedence_role1/tasks/main.yml
View file

@ -10,5 +10,5 @@
- 'param_var == "param_var_role1"' - 'param_var == "param_var_role1"'
- 'vars_var == "vars_var"' - 'vars_var == "vars_var"'
- 'vars_files_var == "vars_files_var"' - 'vars_files_var == "vars_files_var"'
- 'vars_files_var_role == "vars_files_var_role3"' - 'vars_files_var_role == "vars_files_var_role1"'
- 'defaults_file_var_role1 == "defaults_file_var_role1"' - 'defaults_file_var_role1 == "defaults_file_var_role1"'

2
test/integration/roles/test_var_precedence_role2/tasks/main.yml
View file

@ -10,5 +10,5 @@
- 'param_var == "param_var_role2"' - 'param_var == "param_var_role2"'
- 'vars_var == "vars_var"' - 'vars_var == "vars_var"'
- 'vars_files_var == "vars_files_var"' - 'vars_files_var == "vars_files_var"'
- 'vars_files_var_role == "vars_files_var_role3"' - 'vars_files_var_role == "vars_files_var_role2"'
- 'defaults_file_var_role2 == "overridden by role vars"' - 'defaults_file_var_role2 == "overridden by role vars"'