cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure we don't overwrite handlers from include_role when loading a play. Fixes #18140 (#39563)

Browse source
This commit is contained in:
Matt Martz 2018-05-01 12:18:36 -05:00 committed by GitHub
parent 5a6bdef76b
commit 6acdc36317
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/playbook/play.py
View file

@ -171,7 +171,11 @@ class Play(Base, Taggable, Become):
Bare handlers outside of a block are given an implicit block. Bare handlers outside of a block are given an implicit block.
''' '''
try: try:
return load_list_of_blocks(ds=ds, play=self, use_handlers=True, variable_manager=self._variable_manager, loader=self._loader) return self._extend_value(
self.handlers,
load_list_of_blocks(ds=ds, play=self, use_handlers=True, variable_manager=self._variable_manager, loader=self._loader),
prepend=True
)
except AssertionError as e: except AssertionError as e:
raise AnsibleParserError("A malformed block was encountered while loading handlers", obj=self._ds, orig_exc=e) raise AnsibleParserError("A malformed block was encountered while loading handlers", obj=self._ds, orig_exc=e)