Ensure we don't overwrite handlers from include_role when loading a p…

…lay. Fixes ansible#18140 (ansible#39563)
oolongbrothers · May 15, 2018 · 6d7d0f4 · 6d7d0f4
1 parent 013c812
commit 6d7d0f4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
@@ -171,7 +171,11 @@ def _load_handlers(self, attr, ds):
         Bare handlers outside of a block are given an implicit block.
         '''
         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:
             raise AnsibleParserError("A malformed block was encountered while loading handlers", obj=self._ds, orig_exc=e)