Merge branch 'devel' of git://github.com/schmic/ansible into schmic-devel

bin/ansible-playbook

@@ -70,6 +70,8 @@ def main(args):
         help="dump out a list of hosts, each play will run against, does not run playbook!")
     parser.add_option('--syntax-check', dest='syntax', action='store_true',
         help="do a playbook syntax check on the playbook, do not execute the playbook")
+    parser.add_option('--list-tasks', dest='listtasks', action='store_true',
+        help="do list all tasks that would be executed")
 
     options, args = parser.parse_args(args)
 
@@ -84,7 +86,7 @@ def main(args):
 
     sshpass = None
     sudopass = None
-    if not options.listhosts and not options.syntax:
+    if not options.listhosts and not options.syntax and not options.listtasks:
         options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
         if options.ask_pass:
             sshpass = getpass.getpass(prompt="SSH password: ")
@@ -132,18 +134,32 @@ def main(args):
             check=options.check,
             diff=options.diff
         )
-        
+
-        if options.listhosts:
+        if options.listhosts or options.listtasks:
             print 'playbook: %s' % playbook
             playnum = 0
             for (play_ds, play_basedir) in zip(pb.playbook, pb.play_basedirs):
                 playnum += 1
                 play = ansible.playbook.Play(pb, play_ds, play_basedir)
                 label = play.name
-                hosts = pb.inventory.list_hosts(play.hosts)
+                if options.listhosts:
-                print '  hosts in play %s (%s): #%d' % (playnum, label, len(hosts))
+                    hosts = pb.inventory.list_hosts(play.hosts)
-                for host in hosts:
+                    print '  hosts in play %s (%s): #%d' % (playnum, label, len(hosts))
-                    print '    %s' % host
+                    for host in hosts:
+                        print '    %s' % host
+                if options.listtasks:
+                    matched_tags, unmatched_tags = play.compare_tags(pb.only_tags)
+                    unmatched_tags.discard('all')
+                    unknown_tags = set(pb.only_tags) - (matched_tags | unmatched_tags)
+                    if unknown_tags:
+                        msg = 'tag(s) not found in playbook: %s.  possible values: %s'
+                        unknown = ','.join(sorted(unknown_tags))
+                        unmatched = ','.join(sorted(unmatched_tags))
+                        raise errors.AnsibleError(msg % (unknown, unmatched))
+                    print '  tasks in play %s (%s): #%d' % (playnum, label, len(play.tasks()))
+                    for task in play.tasks():
+                        if set(task.tags).intersection(pb.only_tags):
+                            print '    %s' % task.name
             continue
 
         if options.syntax: