From 3f26a1c7f601c40897e8b458daab2c670ba5b7a6 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Mon, 16 Apr 2012 23:47:41 -0400
Subject: [PATCH] verbose option is not being used, so remove it.  debug
 variable still exists.

---
 bin/ansible             | 2 +-
 bin/ansible-playbook    | 1 -
 lib/ansible/playbook.py | 2 --
 lib/ansible/runner.py   | 2 --
 test/TestPlayBook.py    | 1 -
 test/TestRunner.py      | 1 -
 6 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/bin/ansible b/bin/ansible
index b9a393f21bd..9eb5d205d2c 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -90,7 +90,7 @@ class Cli(object):
             forks=options.forks, 
             background=options.seconds, pattern=pattern, 
             callbacks=self.callbacks, sudo=options.sudo, 
-            sudo_pass=sudopass, verbose=True,
+            sudo_pass=sudopass,
             transport=options.connection, debug=options.debug
         )
         return (runner, runner.run())
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index a3818e5585e..403ac19ee47 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -67,7 +67,6 @@ def main(args):
             override_hosts=override_hosts,
             forks=options.forks, 
             debug=options.debug, 
-            verbose=True,
             remote_user=options.remote_user,
             remote_pass=sshpass, 
             callbacks=playbook_cb, 
diff --git a/lib/ansible/playbook.py b/lib/ansible/playbook.py
index 542e86a6300..3e8a79d364e 100755
--- a/lib/ansible/playbook.py
+++ b/lib/ansible/playbook.py
@@ -60,7 +60,6 @@ class PlayBook(object):
         transport        = C.DEFAULT_TRANSPORT,
         override_hosts   = None,
         debug            = False,
-        verbose          = False,
         callbacks        = None,
         runner_callbacks = None,
         stats            = None,
@@ -95,7 +94,6 @@ class PlayBook(object):
         self.remote_port      = remote_port
         self.transport        = transport
         self.debug            = debug
-        self.verbose          = verbose
         self.callbacks        = callbacks
         self.runner_callbacks = runner_callbacks
         self.override_hosts   = override_hosts
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index 894800fc3cd..958ae899955 100755
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -86,7 +86,6 @@ class Runner(object):
         transport=C.DEFAULT_TRANSPORT, 
         conditional='True', 
         callbacks=None, 
-        verbose=False,
         debug=False, 
         sudo=False, 
         module_vars=None, 
@@ -146,7 +145,6 @@ class Runner(object):
         self.module_vars = module_vars
         self.timeout     = timeout
         self.debug       = debug
-        self.verbose     = verbose
         self.remote_user = remote_user
         self.remote_pass = remote_pass
         self.remote_port = remote_port
diff --git a/test/TestPlayBook.py b/test/TestPlayBook.py
index 9e04e254320..97e3f102c3b 100644
--- a/test/TestPlayBook.py
+++ b/test/TestPlayBook.py
@@ -136,7 +136,6 @@ class TestPlaybook(unittest.TestCase):
            timeout      = 5,
            remote_user  = self.user,
            remote_pass  = None,
-           verbose      = False,
            stats            = ans_callbacks.AggregateStats(),
            callbacks        = self.test_callbacks,
            runner_callbacks = self.test_callbacks
diff --git a/test/TestRunner.py b/test/TestRunner.py
index 20c2c4e24cb..d61466040f3 100644
--- a/test/TestRunner.py
+++ b/test/TestRunner.py
@@ -29,7 +29,6 @@ class TestRunner(unittest.TestCase):
            forks=1,
            background=0,
            pattern='all',
-           verbose=True,
        )
        self.cwd = os.getcwd()
        self.test_dir = os.path.join(self.cwd, 'test')