quit plays with an error if there were failed tasks and handler execution is forced

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
index b9bf4251ec..0488e09685 100644
--- a/lib/ansible/playbook/__init__.py
+++ b/lib/ansible/playbook/__init__.py
@@ -826,6 +826,11 @@ class PlayBook(object):
                 # if there were failed tasks and handler execution
                 # is not forced, quit the play with an error
                 return False
+            elif task_errors:
+                # if there were failed tasks and handler execution is forced,
+                # execute all handlers and quit the play with an error
+                self.run_handlers(play)
+                return False
             else:
                 # no errors, go ahead and execute all handlers
                 if not self.run_handlers(play):