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

Correctly create include_role blocks when using loops (#30372)

Browse source 
Also fixes instances where conditionals or other variables may result in
hosts executing lists of tasks of differing sizes.

Fixes #18748
This commit is contained in:
James Cammarata 2017-09-14 15:56:12 -05:00 • committed by GitHub
parent 173c41aefe
commit 6730f81024
3 changed files with 74 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/plugins/strategy/free.py
View file

@ -193,7 +193,18 @@ class StrategyModule(StrategyBase):
for included_file in included_files:
display.debug("collecting new blocks for %s" % included_file)
try:
new_blocks = self._load_included_file(included_file, iterator=iterator)
if included_file._is_role:
new_ir = included_file._task.copy()
new_ir.vars.update(included_file._args)
new_blocks, handler_blocks = new_ir.get_block_list(
play=iterator._play,
variable_manager=self._variable_manager,
loader=self._loader,
)
self._tqm.update_handler_list([handler for handler_block in handler_blocks for handler in handler_block.block])
else:
new_blocks = self._load_included_file(included_file, iterator=iterator)
except AnsibleError as e:
for host in included_file._hosts:
iterator.mark_host_failed(host)