archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3303 from markmandel/feature/sudo_pass

Browse Source 
Don't turn on sudo for all tasks when setting the sudo_user or ask_sudo_pass
pull/3293/merge
Michael DeHaan 12 years ago
parent c2988dfdb0 73dda68e18
commit 506178542d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
bin/ansible-playbook
Unescape Escape View File

@ -91,8 +91,6 @@ def main(args):
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
options.ask_sudo_pass = options.ask_sudo_pass or C.DEFAULT_ASK_SUDO_PASS 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) ( sshpass, sudopass ) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass)
if options.sudo_user or options.ask_sudo_pass:
options.sudo = True
options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER options.sudo_user = options.sudo_user or C.DEFAULT_SUDO_USER
if options.extra_vars and options.extra_vars[0] in '[{': if options.extra_vars and options.extra_vars[0] in '[{':
extra_vars = utils.json_loads(options.extra_vars) extra_vars = utils.json_loads(options.extra_vars)

Write Preview
Loading…
Cancel
Save