diff options
| author | Matt Martz <matt@sivel.net> | 2020-10-29 14:15:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 15:15:18 -0400 |
| commit | e73a0b2460b41c27fd22d286dd2f4407f69f12ed (patch) | |
| tree | 127de78103b30e5835adb26f8aff8b80d894b609 /lib/ansible/plugins | |
| parent | a51a6f4a259b45593c3f803737c6d5d847258a83 (diff) | |
| download | ansible-e73a0b2460b41c27fd22d286dd2f4407f69f12ed.tar.gz | |
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
Diffstat (limited to 'lib/ansible/plugins')
| -rw-r--r-- | lib/ansible/plugins/strategy/free.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/strategy/linear.py | 2 |
2 files changed, 2 insertions, 2 deletions
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, ) |