diff options
author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-13 19:33:19 -0400 |
---|---|---|
committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-13 19:33:19 -0400 |
commit | c3cad50075bfbcd29e53098db82f5ebc1bbd6c4c (patch) | |
tree | f7c43f57dd83e1508d06b9dc5876a1cbb1736c9a /bin | |
parent | f2465e057136374729982a5e7a742fdd0481265a (diff) | |
download | ansible-c3cad50075bfbcd29e53098db82f5ebc1bbd6c4c.tar.gz |
Update manpages, fix missing variable assignment
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/ansible | 3 | ||||
-rwxr-xr-x | bin/ansible-playbook | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/ansible b/bin/ansible index 538e4d0f02..80c7036050 100755 --- a/bin/ansible +++ b/bin/ansible @@ -47,7 +47,7 @@ class Cli(object): def parse(self): ''' create an options parser for bin/ansible ''' - parser = utils.base_parser(constants=C, runas_opts=True, async_opts=True, + parser = utils.base_parser(constants=C, port_opts=True, runas_opts=True, async_opts=True, output_opts=True, connect_opts=True, usage='%prog <host-pattern> [options]') parser.add_option('-a', '--args', dest='module_args', help="module arguments", default=C.DEFAULT_MODULE_ARGS) @@ -70,6 +70,7 @@ class Cli(object): pattern = args[0] sshpass = None + sudopass = None if options.ask_pass: sshpass = getpass.getpass(prompt="SSH password: ") if options.ask_sudo_pass: diff --git a/bin/ansible-playbook b/bin/ansible-playbook index c1e1cb5538..9542e34b9f 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -67,7 +67,7 @@ def main(args): host_list=options.inventory, override_hosts=override_hosts, extra_vars=options.extra_vars, forks=options.forks, debug=options.debug, verbose=True, - remote_pass=sshpass, remote_port=options.remote_port, + remote_pass=sshpass, callbacks=playbook_cb, runner_callbacks=runner_cb, stats=stats, timeout=options.timeout, transport=options.connection, sudo_pass=sudopass |