cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve merge conflict

Browse source
This commit is contained in:
Michael DeHaan 2013-04-22 23:57:20 -04:00
parent 528cb2cb3d
commit be947e5266
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/ansible
View file

@ -20,7 +20,6 @@
######################################################## ########################################################
import sys import sys
import getpass
from ansible.runner import Runner from ansible.runner import Runner
import ansible.constants as C import ansible.constants as C
@ -101,13 +100,9 @@ class Cli(object):
sshpass = None sshpass = None
sudopass = None sudopass = None
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
if options.ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ")
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
if options.ask_sudo_pass: ( sshpass, sudopass ) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass)
sudopass = getpass.getpass(prompt="sudo password: ") if options.sudo_user or options.ask_sudo_pass:
options.sudo = True
if options.sudo_user:
options.sudo = True 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.tree: if options.tree:

9
bin/ansible-playbook
View file

@ -19,7 +19,6 @@
####################################################### #######################################################
import sys import sys
import getpass
import os import os
import ansible.playbook import ansible.playbook
@ -93,13 +92,9 @@ def main(args):
sudopass = None sudopass = None
if not options.listhosts and not options.syntax and not options.listtasks: if not options.listhosts and not options.syntax and not options.listtasks:
options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS options.ask_pass = options.ask_pass or C.DEFAULT_ASK_PASS
if options.ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ")
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
if options.ask_sudo_pass: ( sshpass, sudopass ) = utils.ask_passwords(ask_pass=options.ask_pass, ask_sudo_pass=options.ask_sudo_pass)
sudopass = getpass.getpass(prompt="sudo password: ") if options.sudo_user or options.ask_sudo_pass:
options.sudo = True
if options.sudo_user:
options.sudo = True 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
extra_vars = utils.parse_kv(options.extra_vars) extra_vars = utils.parse_kv(options.extra_vars)

17
lib/ansible/utils/__init__.py
View file

@ -38,6 +38,7 @@ import random
import difflib import difflib
import warnings import warnings
import traceback import traceback
import getpass
VERBOSITY=0 VERBOSITY=0
@ -496,6 +497,22 @@ def base_parser(constants=C, usage="", output_opts=False, runas_opts=False,
return parser return parser
def ask_passwords(ask_pass=False, ask_sudo_pass=False):
sshpass = None
sudopass = None
sudo_prompt = "sudo password: "
if ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ")
sudo_prompt = "sudo password [defaults to SSH password]: "
if ask_sudo_pass:
sudopass = getpass.getpass(prompt=sudo_prompt)
if ask_pass and sudopass == '':
sudopass = sshpass
return (sshpass, sudopass)
def do_encrypt(result, encrypt, salt_size=None, salt=None): def do_encrypt(result, encrypt, salt_size=None, salt=None):
if PASSLIB_AVAILABLE: if PASSLIB_AVAILABLE:
try: try: