ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 03:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixing parentage of include_role objects for param inheritance

Browse source 
Fixes #17686
This commit is contained in:
James Cammarata 2016-09-30 16:05:43 -05:00
parent 6be2f0bded
commit e4ee9de3f4
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/role_include.py
View file

@ -68,7 +68,6 @@ class IncludeRole(Task):
ri = RoleInclude.load(self.name, play=myplay, variable_manager=variable_manager, loader=loader) ri = RoleInclude.load(self.name, play=myplay, variable_manager=variable_manager, loader=loader)
ri.vars.update(self.vars) ri.vars.update(self.vars)
#ri._role_params.update(self.args) # jimi-c cant we avoid this?
# build role # build role
actual_role = Role.load(ri, myplay, parent_role=self._parent_role, from_files=self._from_files) actual_role = Role.load(ri, myplay, parent_role=self._parent_role, from_files=self._from_files)
@ -78,7 +77,7 @@ class IncludeRole(Task):
# set parent to ensure proper inheritance # set parent to ensure proper inheritance
for b in blocks: for b in blocks:
b._parent = self._parent b._parent = self
# updated available handlers in play # updated available handlers in play
myplay.handlers = myplay.handlers + actual_role.get_handler_blocks(play=myplay) myplay.handlers = myplay.handlers + actual_role.get_handler_blocks(play=myplay)
@ -108,8 +107,13 @@ class IncludeRole(Task):
new_me = super(IncludeRole, self).copy(exclude_parent=exclude_parent, exclude_tasks=exclude_tasks) new_me = super(IncludeRole, self).copy(exclude_parent=exclude_parent, exclude_tasks=exclude_tasks)
new_me.statically_loaded = self.statically_loaded new_me.statically_loaded = self.statically_loaded
new_me.name = self.name
new_me._from_files = self._from_files.copy() new_me._from_files = self._from_files.copy()
new_me._parent_role = self._parent_role new_me._parent_role = self._parent_role
return new_me return new_me
def get_include_params(self):
v = super(IncludeRole, self).get_include_params()
if self._parent_role:
v.update(self._parent_role.get_role_params())
return v

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

@ -318,7 +318,7 @@ class Task(Base, Conditional, Taggable, Become):
all_vars = dict() all_vars = dict()
if self._parent: if self._parent:
all_vars.update(self._parent.get_include_params()) all_vars.update(self._parent.get_include_params())
if self.action == 'include': if self.action in ('include', 'include_role'):
all_vars.update(self.vars) all_vars.update(self.vars)
return all_vars return all_vars