diff --git a/bin/ansible b/bin/ansible index b9a393f21b..9eb5d205d2 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 a3818e5585..403ac19ee4 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 542e86a630..3e8a79d364 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 894800fc3c..958ae89995 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 9e04e25432..97e3f102c3 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 20c2c4e24c..d61466040f 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')