summaryrefslogtreecommitdiff
path: root/bin/ansible-playbook
diff options
context:
space:
mode:
authorPaul Durivage <pauldurivage@gmail.com>2013-12-17 16:26:58 -0600
committerPaul Durivage <pauldurivage@gmail.com>2014-01-20 11:25:10 -0600
commit4088243debb24388b4e8952756fb1b13a4e39598 (patch)
tree5d1ea43cba9f8ee84bf71cca37f1843017a817be /bin/ansible-playbook
parent297a28aa79098e86933f46939177d2da2bf3aa14 (diff)
downloadansible-4088243debb24388b4e8952756fb1b13a4e39598.tar.gz
Proposing fix for Issue #4324; adding support for su in connection plugins ssh, ssh_alt
Fixes for ssh_alt support, adding in references to in_data where appropriate
Diffstat (limited to 'bin/ansible-playbook')
-rwxr-xr-xbin/ansible-playbook11
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index c0db66993c..4f8934ebb5 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -90,14 +90,18 @@ def main(args):
sshpass = None
sudopass = None
+ su_pass = None
if not options.listhosts and not options.syntax and not options.listtasks:
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
# Never ask for an SSH password when we run with local connection
if options.connection == "local":
options.ask_pass = False
options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS
- (sshpass, sudopass) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass)
+ options.ask_su_pass = options.ask_su_pass or C.DEFAULT_ASK_SU_PASS
+ (sshpass, sudopass, su_pass) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass, ask_su_pass=options.ask_su_pass)
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
+ options.su_user = options.su_user or C.DEFAULT_SU_USER
+
extra_vars = {}
for extra_vars_opt in options.extra_vars:
@@ -156,7 +160,10 @@ def main(args):
only_tags=only_tags,
skip_tags=skip_tags,
check=options.check,
- diff=options.diff
+ diff=options.diff,
+ su=options.su,
+ su_pass=su_pass,
+ su_user=options.su_user
)
if options.listhosts or options.listtasks or options.syntax: