Merge pull request #3159 from cchurch/devel

Callback Plugin Context / Naming Fixes

4 files changed, 22 insertions, 5 deletions

diff --git a/lib/ansible/callback_plugins/noop.py b/lib/ansible/callback_plugins/noop.py
index 826bad0f7e..54a2b254fc 100644
--- a/lib/ansible/callback_plugins/noop.py
+++ b/lib/ansible/callback_plugins/noop.py
@@ -63,10 +63,10 @@ class CallbackModule(object):
     def playbook_on_notify(self, host, handler):
         pass
 
-    def on_no_hosts_matched(self):
+    def playbook_on_no_hosts_matched(self):
         pass
 
-    def on_no_hosts_remaining(self):
+    def playbook_on_no_hosts_remaining(self):
         pass
 
     def playbook_on_task_start(self, name, is_conditional):
diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py
index c2e43187ce..8b69d19a0e 100644
--- a/lib/ansible/playbook/__init__.py
+++ b/lib/ansible/playbook/__init__.py
@@ -213,10 +213,7 @@ class PlayBook(object):
         self.callbacks.on_start()
         for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs):
             play = Play(self, play_ds, play_basedir)
-
             assert play is not None
-            ansible.callbacks.set_play(self.callbacks, play)
-            ansible.callbacks.set_play(self.runner_callbacks, play)
             
             matched_tags, unmatched_tags = play.compare_tags(self.only_tags)
             matched_tags_all = matched_tags_all | matched_tags
@@ -242,8 +239,12 @@ class PlayBook(object):
             raise errors.AnsibleError(msg % (unknown, unmatched))
 
         for play in plays:
+            ansible.callbacks.set_play(self.callbacks, play)
+            ansible.callbacks.set_play(self.runner_callbacks, play)
             if not self._run_play(play):
                 break
+            ansible.callbacks.set_play(self.callbacks, None)
+            ansible.callbacks.set_play(self.runner_callbacks, None)
 
         # summarize the results
         results = {}
@@ -325,6 +326,8 @@ class PlayBook(object):
 
         self.callbacks.on_task_start(template(play.basedir, task.name, task.module_vars, lookup_fatal=False), is_handler)
         if hasattr(self.callbacks, 'skip_task') and self.callbacks.skip_task:
+            ansible.callbacks.set_task(self.callbacks, None)
+            ansible.callbacks.set_task(self.runner_callbacks, None)
             return True
         
         # load up an appropriate ansible runner to run the task in parallel
@@ -365,6 +368,8 @@ class PlayBook(object):
                     for handler_name in task.notify:
                         self._flag_handler(play, template(play.basedir, handler_name, task.module_vars), host)
 
+        ansible.callbacks.set_task(self.callbacks, None)
+        ansible.callbacks.set_task(self.runner_callbacks, None)
         return hosts_remaining
 
     # *****************************************************
diff --git a/plugins/callbacks/log_plays.py b/plugins/callbacks/log_plays.py
index 41c5d1b86a..8f037d6b1a 100644
--- a/plugins/callbacks/log_plays.py
+++ b/plugins/callbacks/log_plays.py
@@ -90,6 +90,12 @@ class CallbackModule(object):
     def playbook_on_notify(self, host, handler):
         pass
 
+    def playbook_on_no_hosts_matched(self):
+        pass
+
+    def playbook_on_no_hosts_remaining(self):
+        pass
+
     def playbook_on_task_start(self, name, is_conditional):
         pass
 
diff --git a/plugins/callbacks/osx_say.py b/plugins/callbacks/osx_say.py
index 89c82ca530..9f6763c100 100644
--- a/plugins/callbacks/osx_say.py
+++ b/plugins/callbacks/osx_say.py
@@ -67,6 +67,12 @@ class CallbackModule(object):
     def playbook_on_notify(self, host, handler):
         say("pew", LASER_VOICE)
 
+    def playbook_on_no_hosts_matched(self):
+        pass
+
+    def playbook_on_no_hosts_remaining(self):
+        pass
+
     def playbook_on_task_start(self, name, is_conditional):
         if not is_conditional:
             say("Starting task: %s" % name, REGULAR_VOICE)