From e73a0b2460b41c27fd22d286dd2f4407f69f12ed Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Thu, 29 Oct 2020 14:15:18 -0500 Subject: Explicitly get the include task, and not assume it is the parent (#72378) * Explicitly get the include task, and not assume it is the parent. Fixes #6571 --- lib/ansible/plugins/strategy/free.py | 2 +- lib/ansible/plugins/strategy/linear.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/ansible/plugins') diff --git a/lib/ansible/plugins/strategy/free.py b/lib/ansible/plugins/strategy/free.py index 00cf83b549..e832f22adb 100644 --- a/lib/ansible/plugins/strategy/free.py +++ b/lib/ansible/plugins/strategy/free.py @@ -259,7 +259,7 @@ class StrategyModule(StrategyBase): continue for new_block in new_blocks: - task_vars = self._variable_manager.get_vars(play=iterator._play, task=new_block._parent, + task_vars = self._variable_manager.get_vars(play=iterator._play, task=new_block.get_first_parent_include(), _hosts=self._hosts_cache, _hosts_all=self._hosts_cache_all) final_block = new_block.filter_tagged_tasks(task_vars) diff --git a/lib/ansible/plugins/strategy/linear.py b/lib/ansible/plugins/strategy/linear.py index 415d3cd438..2fb524953c 100644 --- a/lib/ansible/plugins/strategy/linear.py +++ b/lib/ansible/plugins/strategy/linear.py @@ -366,7 +366,7 @@ class StrategyModule(StrategyBase): for new_block in new_blocks: task_vars = self._variable_manager.get_vars( play=iterator._play, - task=new_block._parent, + task=new_block.get_first_parent_include(), _hosts=self._hosts_cache, _hosts_all=self._hosts_cache_all, ) -- cgit v1.2.1