[stable-2.7] Use the copied and merged task for calculating task vars in the free strategy. Fixes #47024 (#47060)

(cherry picked from commit c3d5779)

Co-authored-by: Matt Martz <matt@sivel.net>
This commit is contained in:
Matt Martz 2018-10-15 16:07:52 -05:00 committed by Toshio Kuratomi
parent 7269eb5413
commit 20c1cf41a4
2 changed files with 3 additions and 1 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- dynamic includes - Use the copied and merged task for calculating task vars in the free strategy (https://github.com/ansible/ansible/issues/47024)

View file

@ -237,7 +237,7 @@ class StrategyModule(StrategyBase):
continue continue
for new_block in new_blocks: for new_block in new_blocks:
task_vars = self._variable_manager.get_vars(play=iterator._play, task=included_file._task) task_vars = self._variable_manager.get_vars(play=iterator._play, task=new_block._parent)
final_block = new_block.filter_tagged_tasks(play_context, task_vars) final_block = new_block.filter_tagged_tasks(play_context, task_vars)
for host in hosts_left: for host in hosts_left:
if host in included_file._hosts: if host in included_file._hosts: