Ensure environment is inherited properly (task->block/include->play)

This commit is contained in:
James Cammarata 2015-11-09 14:51:07 -05:00
commit 76ae577519
3 changed files with 7 additions and 6 deletions

View file

@ -323,8 +323,9 @@ class Block(Base, Become, Conditional, Taggable):
Override for the 'tags' getattr fetcher, used from Base.
'''
environment = self._attributes['environment']
if environment is None:
environment = self._get_parent_attribute('environment', extend=True)
parent_environment = self._get_parent_attribute('environment', extend=True)
if parent_environment is not None:
environment = self._extend_value(environment, parent_environment)
return environment