Further tweaks to variable precedence to make it match our docs

Also removes looking at role variables from the Block, as those are
merged in separately via VariableManager
This commit is contained in:
James Cammarata 2016-06-07 12:08:01 -05:00
commit 068e447fda
2 changed files with 14 additions and 4 deletions

View file

@ -65,8 +65,6 @@ class Block(Base, Become, Conditional, Taggable):
all_vars = self.vars.copy()
if self._role:
all_vars.update(self._role.get_vars(self._dep_chain, include_params=False))
if self._parent_block:
all_vars.update(self._parent_block.get_vars())
if self._task_include: