Remove unnecessary role initialization and lookup stuff

* Remove unnecessary copying of values from parents to role deps, as
  this can cause problems when roles have multiple parents (or the same
  parents with different params speficied through deps)
* Since we're already checking the dep chain in the block for role
  things (which every task in a role should have), it is not necessary
  to check the role directly in case it improperly grabs something

Fixes #14438
This commit is contained in:
James Cammarata 2016-06-23 16:46:16 -05:00
commit 3e4755f7e4
2 changed files with 0 additions and 13 deletions

View file

@ -269,9 +269,6 @@ class Block(Base, Become, Conditional, Taggable):
if self._parent_block is not None:
if not self._parent_block.evaluate_conditional(templar, all_vars):
return False
elif self._role is not None:
if not self._role.evaluate_conditional(templar, all_vars):
return False
return super(Block, self).evaluate_conditional(templar, all_vars)
def set_loader(self, loader):