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

Merge pull request #16181 from privateip/working

Browse source 
fixes issue with ssh keyfile and nxos authentication
This commit is contained in:
Peter Sprygada 2016-06-07 21:27:45 -04:00
commit bd8b041756
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/module_utils/nxos.py
View file

@ -35,7 +35,8 @@ NET_COMMON_ARGS = dict(
transport=dict(default='cli', choices=['cli', 'nxapi']), transport=dict(default='cli', choices=['cli', 'nxapi']),
use_ssl=dict(default=False, type='bool'), use_ssl=dict(default=False, type='bool'),
validate_certs=dict(default=True, type='bool'), validate_certs=dict(default=True, type='bool'),
provider=dict(type='dict') provider=dict(type='dict'),
timeout=dict(default=10, type='int')
) )
NXAPI_COMMAND_TYPES = ['cli_show', 'cli_show_ascii', 'cli_conf', 'bash'] NXAPI_COMMAND_TYPES = ['cli_show', 'cli_show_ascii', 'cli_conf', 'bash']
@ -168,11 +169,17 @@ class Cli(object):
username = self.module.params['username'] username = self.module.params['username']
password = self.module.params['password'] password = self.module.params['password']
timeout = self.module.params['timeout']
key_filename = self.module.params['ssh_keyfile'] key_filename = self.module.params['ssh_keyfile']
allow_agent = (key_filename is not None) or (key_filename is None and password is None)
try: try:
self.shell = Shell(kickstart=False, prompts_re=CLI_PROMPTS_RE, errors_re=CLI_ERRORS_RE) self.shell = Shell(kickstart=False, prompts_re=CLI_PROMPTS_RE,
self.shell.open(host, port=port, username=username, password=password, key_filename=key_filename) errors_re=CLI_ERRORS_RE)
self.shell.open(host, port=port, username=username,
password=password, key_filename=key_filename,
allow_agent=allow_agent, timeout=timeout)
except ShellError: except ShellError:
e = get_exception() e = get_exception()
msg = 'failed to connect to %s:%s - %s' % (host, port, str(e)) msg = 'failed to connect to %s:%s - %s' % (host, port, str(e))