Merge pull request #4 from skvidal/master

adds an option to ask for and store the ssh password from the cli
This commit is contained in:
Michael DeHaan 2012-02-24 15:27:19 -08:00
commit b2e8084c50
2 changed files with 13 additions and 2 deletions

View file

@ -24,6 +24,7 @@
from optparse import OptionParser
import json
import os
import getpass
import ansible
DEFAULT_HOST_LIST = '/etc/ansible/hosts'
@ -41,6 +42,8 @@ class Cli(object):
def runner(self):
parser = OptionParser()
parser.add_option("-P", "--askpass", default=False, action="store_true",
help="ask the user to input the ssh password for connecting")
parser.add_option("-H", "--host-list", dest="host_list",
help="path to hosts list", default=DEFAULT_HOST_LIST)
parser.add_option("-L", "--library", dest="module_path",
@ -61,11 +64,16 @@ class Cli(object):
# TODO: more shell like splitting on module_args would
# be a good idea
sshpass = None
if options.askpass:
sshpass = getpass.getpass(prompt="SSH password: ")
return ansible.Runner(
module_name=options.module_name,
module_path=options.module_path,
module_args=options.module_args.split(' '),
remote_user=options.remote_user,
remote_pass=sshpass,
host_list=options.host_list,
forks=options.forks,
pattern=options.pattern,

View file

@ -36,6 +36,7 @@ DEFAULT_FORKS = 3
DEFAULT_MODULE_ARGS = ''
DEFAULT_TIMEOUT = 60
DEFAULT_REMOTE_USER = 'root'
DEFAULT_REMOTE_PASS = None
def _executor_hook(x):
''' callback used by multiprocessing pool '''
@ -53,6 +54,7 @@ class Runner(object):
timeout=DEFAULT_TIMEOUT,
pattern=DEFAULT_PATTERN,
remote_user=DEFAULT_REMOTE_USER,
remote_pass=DEFAULT_REMOTE_PASS,
verbose=False):
@ -69,6 +71,7 @@ class Runner(object):
self.timeout = timeout
self.verbose = verbose
self.remote_user = remote_user
self.remote_pass = remote_pass
def _parse_hosts(self, host_list):
''' parse the host inventory file if not sent as an array '''
@ -95,8 +98,8 @@ class Runner(object):
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try:
ssh.connect(host, username=self.remote_user,
allow_agent=True, look_for_keys=True)
ssh.connect(host, username=self.remote_user, allow_agent=True,
look_for_keys=True, password=self.remote_pass)
return [ True, ssh ]
except:
return [ False, traceback.format_exc() ]