From 291c1eb57d0dacf23d19ea63f4ee80951e074b7f Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Fri, 2 Feb 2018 10:52:58 -0600
Subject: [PATCH] make v2_playbook_on_notify method signatures consistent

This was causing an exception in the TaskQueueManager when a third
party handler plugin was processed that inherited or explicitly
called the callback method from super because the method signature
was incorrect in callback/__init__ and it processed the arguments as
incorrect data types as a side effect.

Signed-off-by: Adam Miller <admiller@redhat.com>
(cherry picked from commit dd9b2c077472eaf446ff932c8ae1877d00147299)
---
 CHANGELOG.md                             | 4 +++-
 lib/ansible/plugins/callback/__init__.py | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12fa73d5fe4..6c215702d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,8 +61,10 @@ Ansible Changes By Release
 * Be more tolerant about spaces when gathering virtual facts (https://github.com/ansible/ansible/pull/36042)
 * validate add_host name parameter (https://github.com/ansible/ansible/pull/36055)
 * spelling fixes (https://github.com/ansible/ansible/pull/36007)
+* avoid needles vault prompt on ansible-console (https://github.com/ansible/ansible/pull/36244)
+* fix callback function signatures (https://github.com/ansible/ansible/pull/35664)
 
-<a id="2.4.3"></a>
+<a id="2.4.3"></a
 
 ## 2.4.3 "Dancing Days" - 2018-01-31
 
diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py
index 0dbcd57c4c9..922ecb5e289 100644
--- a/lib/ansible/plugins/callback/__init__.py
+++ b/lib/ansible/plugins/callback/__init__.py
@@ -336,8 +336,7 @@ class CallbackBase(AnsiblePlugin):
     def v2_playbook_on_start(self, playbook):
         self.playbook_on_start()
 
-    def v2_playbook_on_notify(self, result, handler):
-        host = result._host.get_name()
+    def v2_playbook_on_notify(self, handler, host):
         self.playbook_on_notify(host, handler)
 
     def v2_playbook_on_no_hosts_matched(self):