Allow --user for playbooks, no need for port setting as can specify in inventory file now.

2 files changed, 18 insertions, 10 deletions

diff --git a/bin/ansible b/bin/ansible
index 844004ecc4..b9a393f21b 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, port_opts=True, runas_opts=True, async_opts=True,
+        parser = utils.base_parser(constants=C, 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)
@@ -87,7 +87,7 @@ class Cli(object):
             module_args=options.module_args,
             remote_user=options.remote_user, remote_pass=sshpass,
             host_list=options.inventory, timeout=options.timeout, 
-            remote_port=options.remote_port, forks=options.forks, 
+            forks=options.forks, 
             background=options.seconds, pattern=pattern, 
             callbacks=self.callbacks, sudo=options.sudo, 
             sudo_pass=sudopass, verbose=True,
@@ -104,8 +104,7 @@ class Cli(object):
             module_args="jid=%s" % jid, remote_user=old_runner.remote_user,
             remote_pass=old_runner.remote_pass, inventory=old_runner.inventory,
             timeout=old_runner.timeout, forks=old_runner.forks,
-            remote_port=old_runner.remote_port, pattern='*', 
-            callbacks=self.silent_callbacks, verbose=True,
+            pattern='*', callbacks=self.silent_callbacks, verbose=True,
         )
 
     # ----------------------------------------------
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index 9542e34b9f..a84b30705c 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -33,7 +33,7 @@ def main(args):
 
     # create parser for CLI options
     usage = "%prog playbook.yml"
-    parser = utils.base_parser(constants=C, usage=usage, connect_opts=True)
+    parser = utils.base_parser(constants=C, usage=usage, connect_opts=True, runas_opts=True)
     parser.add_option('-e', '--extra-vars', dest='extra_vars',
         help='arguments to pass to the inventory script')
     parser.add_option('-O', '--override-hosts', dest="override_hosts", default=None,
@@ -63,13 +63,22 @@ def main(args):
         runner_cb = callbacks.PlaybookRunnerCallbacks(stats)
 
         pb = ansible.playbook.PlayBook(
-            playbook=playbook,module_path=options.module_path,
-            host_list=options.inventory, override_hosts=override_hosts,
+            playbook=playbook,
+            module_path=options.module_path,
+            host_list=options.inventory, 
+            override_hosts=override_hosts,
             extra_vars=options.extra_vars,
-            forks=options.forks, debug=options.debug, verbose=True,
+            forks=options.forks, 
+            debug=options.debug, 
+            verbose=True,
+            remote_user=options.remote_user,
             remote_pass=sshpass, 
-            callbacks=playbook_cb, runner_callbacks=runner_cb, stats=stats,
-            timeout=options.timeout, transport=options.connection,
+            callbacks=playbook_cb, 
+            runner_callbacks=runner_cb, 
+            stats=stats,
+            timeout=options.timeout, 
+            transport=options.connection,
+            sudo=options.sudo,
             sudo_pass=sudopass
         )
         try: