From 56e5e72aaa6f15d7f9de9b8ca95fc61b84f6451e Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Fri, 30 Oct 2015 09:44:35 -0400
Subject: [PATCH] Make handlers obey run_once (or BYPASS_HOST_LOOP)

Fixes #12972
---
 lib/ansible/plugins/strategy/__init__.py | 12 ++++++++++++
 lib/ansible/plugins/strategy/linear.py   |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py
index 7a9dfe6b54..e5c43572c2 100644
--- a/lib/ansible/plugins/strategy/__init__.py
+++ b/lib/ansible/plugins/strategy/__init__.py
@@ -502,12 +502,24 @@ class StrategyBase:
         if notified_hosts is None:
             notified_hosts = self._notified_handlers[handler_name]
 
+        run_once = False
+        try:
+            action = action_loader.get(handler.action, class_only=True)
+            if handler.run_once or getattr(action, 'BYPASS_HOST_LOOP', False):
+                run_once = True
+        except KeyError:
+            # we don't care here, because the action may simply not have a
+            # corresponding action plugin
+            pass
+
         host_results = []
         for host in notified_hosts:
             if not handler.has_triggered(host) and (host.name not in self._tqm._failed_hosts or play_context.force_handlers):
                 task_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, host=host, task=handler)
                 task_vars = self.add_tqm_variables(task_vars, play=iterator._play)
                 self._queue_task(host, handler, task_vars, play_context)
+                if run_once:
+                    break
 
         # collect the results from the handler run
         host_results = self._wait_on_pending_results(iterator)
diff --git a/lib/ansible/plugins/strategy/linear.py b/lib/ansible/plugins/strategy/linear.py
index 08ee18929d..22d2a708ed 100644
--- a/lib/ansible/plugins/strategy/linear.py
+++ b/lib/ansible/plugins/strategy/linear.py
@@ -176,7 +176,6 @@ class StrategyModule(StrategyBase):
                     run_once = False
                     work_to_do = True
 
-
                     # test to see if the task across all hosts points to an action plugin which
                     # sets BYPASS_HOST_LOOP to true, or if it has run_once enabled. If so, we
                     # will only send this task to the first host in the list.