Breakout includes into seperate functions, allow vars to apply to handlers but handlers

still may not be parameterized because it does not make sense to import them more than
once since they are keyed by name.

lib/ansible/playbook.py

@@ -25,7 +25,8 @@ import shlex
 import os
 import jinja2
 
-SETUP_CACHE={ 'foo' : {} }
+# used to transfer variables to Runner
+SETUP_CACHE={ }
 
 #############################################
 
@@ -82,21 +83,7 @@ class PlayBook(object):
 
         self.playbook = self._parse_playbook(playbook)
 
-    def _parse_playbook(self, playbook):
+    def _include_tasks(self, play, task, dirname, new_tasks):
-        ''' load YAML file, including handling for imported files '''
-        
-        dirname  = os.path.dirname(playbook)
-        playbook = yaml.load(file(playbook).read())
-
-        for play in playbook:
-            tasks = play.get('tasks',[])
-            handlers = play.get('handlers', [])
-
-            # process tasks in this file as well as imported tasks
-            new_tasks = []
-            for task in tasks:
-               if 'include' in task:
-                   # FIXME: refactor
         # an include line looks like:
         # include: some.yml a=2 b=3 c=4
         include_tokens = task['include'].split()
@@ -112,6 +99,32 @@ class PlayBook(object):
             included = yaml.load(included)
             for x in included:
                 new_tasks.append(x)
+
+    def _include_handlers(self, play, handler, dirname, new_handlers):
+        path = path_dwim(dirname, handler['include'])
+        included = file(path).read()
+        inject_vars = play.get('vars', {})
+        template = jinja2.Template(included)
+        included = template.render(inject_vars)
+        included = yaml.load(included)
+        for x in included:
+            new_handlers.append(x)
+
+    def _parse_playbook(self, playbook):
+        ''' load YAML file, including handling for imported files '''
+        
+        dirname  = os.path.dirname(playbook)
+        playbook = yaml.load(file(playbook).read())
+
+        for play in playbook:
+            tasks = play.get('tasks',[])
+            handlers = play.get('handlers', [])
+
+            # process tasks in this file as well as imported tasks
+            new_tasks = []
+            for task in tasks:
+               if 'include' in task:
+                   self._include_tasks(play, task, dirname, new_tasks)
                else:
                    new_tasks.append(task)
             play['tasks'] = new_tasks
@@ -120,10 +133,7 @@ class PlayBook(object):
             new_handlers = [] 
             for handler in handlers:
                if 'include' in handler:
-                   path = path_dwim(dirname, handler['include'])
+                   self._include_handlers(play, handler, dirname, new_handlers)
-                   included = yaml.load(file(path).read())
-                   for x in included:
-                       new_handlers.append(x)
                else:
                    new_handlers.append(handler)
             play['handlers'] = new_handlers