From fd64e5958df529bb71f5b769d64f5b0f5223dff2 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 10 Feb 2016 21:27:14 -0500 Subject: [PATCH] Fixing bugs related to nested blocks inside roles * Make sure dep chains are checked recursively for nested blocks * Fixing iterator is_failed() check to make sure we're not in a rescue block before returning True * Use is_failed() to test whether a host should be added to the TQM failed_hosts list * Use is_failed() when compiling the list of hosts left to iterate over in both the linear and free strategies Fixes #14222 --- lib/ansible/playbook/block.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/ansible/playbook/block.py b/lib/ansible/playbook/block.py index 1c9569de8da..d5cd7030507 100644 --- a/lib/ansible/playbook/block.py +++ b/lib/ansible/playbook/block.py @@ -153,8 +153,6 @@ class Block(Base, Become, Conditional, Taggable): if self._dep_chain is None: if self._parent_block: return self._parent_block.get_dep_chain() - elif self._task_include: - return self._task_include._block.get_dep_chain() else: return None else: