Make parameterized playbook includes work with vars as a list

Fixes #1610.

lib/ansible/playbook/__init__.py

@@ -166,7 +166,10 @@ class PlayBook(object):
                         for p in plays:
                             if 'vars' not in p:
                                 p['vars'] = {}
+                            if isinstance(p['vars'], dict):
                                 p['vars'].update(incvars)
+                            elif isinstance(p['vars'], list):
+                                p['vars'].extend([dict(k=v) for k,v in incvars.iteritems()])
                         accumulated_plays.extend(plays)
                         play_basedirs.extend(basedirs)
 

test/TestPlayBook.py

@@ -217,7 +217,7 @@ class TestPlaybook(unittest.TestCase):
            "localhost": {
                "changed": 0,
                "failures": 0,
-               "ok": 5,
+               "ok": 10,
                "skipped": 0,
                "unreachable": 0
            }   

test/playbook-included.yml

@@ -3,3 +3,10 @@
   gather_facts: False
   tasks:
   - action: debug msg="$variable"
+
+- hosts: all
+  vars:
+  - ugly: var
+  gather_facts: False
+  tasks:
+  - action: debug msg="$variable"