Applying callback model to runner, and using that in playbooks, so output can be more immediate in playbooks.

(Runner still does not use callbacks for default output)

lib/ansible/callbacks.py

@@ -23,25 +23,70 @@ import utils
 
 #######################################################
 
-class PlaybookCallbacks(object):
-  
+class AggregateStats(object):
+    
+    def __init__(self):
+        self.processed   = {}
+        self.failures    = {}
+        self.ok          = {}
+        self.dark        = {}
+        self.changed     = {}
+        self.skipped     = {}
+
+    def _increment(self, what, host):
+        self.processed[host] = 1
+        prev = (getattr(self, what)).get(host, 0)
+        getattr(self, what)[host] = prev+1
+
+    def compute(self, runner_results, setup=False, poll=False):
+ 
+        for (host, value) in runner_results.get('contacted', {}).iteritems():
+            if ('failed' in value and bool(value['failed'])) or ('rc' in value and value['rc'] != 0):
+                self._increment('failures', host)
+            elif 'skipped' in value and bool(value['skipped']):
+                self._increment('skipped', host)
+            elif 'changed' in value and bool(value['changed']):
+                if not setup:
+                    self._increment('changed', host)
+                self._increment('ok', host)
+            else:
+                if not poll or ('finished' in value and bool(value['finished'])):
+                    self._increment('ok', host)
+
+        for (host, value) in runner_results.get('dark', {}).iteritems():
+            self._increment('dark', host)
+            
+
+    def summarize(self, host):
+        return dict(
+            ok          = self.ok.get(host, 0),
+            failures    = self.failures.get(host, 0),
+            unreachable = self.dark.get(host,0),
+            changed     = self.changed.get(host, 0),
+            skipped     = self.skipped.get(host, 0)
+        )
+
+class DefaultRunnerCallbacks(object):
+
     def __init__(self):
         pass
 
-    def set_playbook(self, playbook):
-        self.playbook = playbook
+    def on_failed(self, host, res):
+        pass
 
-    def on_start(self):
-        print "\n"
+    def on_ok(self, host, res):
+        pass
 
-    def on_task_start(self, name, is_conditional):
-        print utils.task_start_msg(name, is_conditional)
+    def on_skipped(self, host):
+        pass
 
-    def on_setup_primary(self):
-        print "SETUP PHASE ****************************\n"
-    
-    def on_setup_secondary(self):
-        print "\nVARIABLE IMPORT PHASE ******************\n"
+    def on_unreachable(self, host, res):
+        pass
+
+class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
+
+    def __init__(self, stats):
+        self.stats = stats
 
     def on_unreachable(self, host, msg):
         print "unreachable: [%s] => %s" % (host, msg)
@@ -55,7 +100,9 @@ class PlaybookCallbacks(object):
 
     def on_ok(self, host, host_result):
         invocation = host_result.get('invocation',None)
-        if not invocation or invocation.startswith('setup ') or invocation.startswith('async_status '):
+        if invocation.startswith('async_status'):
+            pass
+        elif not invocation or invocation.startswith('setup '):
             print "ok: [%s]\n" % (host)
         else:
             print "ok: [%s] => %s\n" % (host, invocation)
@@ -63,6 +110,30 @@ class PlaybookCallbacks(object):
     def on_skipped(self, host):
         print "skipping: [%s]\n" % host
 
+class PlaybookCallbacks(object):
+  
+    def __init__(self):
+        pass
+
+    # TOOD: -- remove this
+    def set_playbook(self, playbook):
+        self.playbook = playbook
+
+    def on_start(self):
+        print "\n"
+
+    def on_notify(self, host, handler):
+        pass
+
+    def on_task_start(self, name, is_conditional):
+        print utils.task_start_msg(name, is_conditional)
+
+    def on_setup_primary(self):
+        print "SETUP PHASE ****************************\n"
+    
+    def on_setup_secondary(self):
+        print "\nVARIABLE IMPORT PHASE ******************\n"
+
     def on_import_for_host(self, host, imported_file):
         print "%s: importing %s" % (host, imported_file)
 
@@ -78,6 +149,3 @@ class PlaybookCallbacks(object):
     def on_async_poll(self, jid, host, clock, host_result):
         print utils.async_poll_status(jid, host, clock, host_result)
 
-    def on_dark_host(self, host, msg):
-        print "exception: [%s] => %s" % (host, msg)
-