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

fixes using ssh keyfile with junos network module

Browse source 
The junos network module will now properly use the ssh key file if its
passed from the playbook to authenticate to the remote device.  Prior
to this commit, the ssh keyfile was ignored.
This commit is contained in:
Peter Sprygada 2016-06-13 22:39:51 -04:00
parent 9cbb1a196b
commit 6e2651ce07
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/module_utils/junos.py
View file

@ -93,9 +93,12 @@ class Cli(object):
password = self.module.params['password'] password = self.module.params['password']
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() self.shell = Shell()
self.shell.open(host, port=port, username=username, password=password, key_filename=key_filename, allow_agent=True) self.shell.open(host, port=port, username=username, password=password,
key_filename=key_filename, allow_agent=allow_agent)
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))
@ -152,9 +155,10 @@ class Netconf(object):
user = self.module.params['username'] user = self.module.params['username']
passwd = self.module.params['password'] passwd = self.module.params['password']
key_filename = self.module.params['ssh_keyfile']
self.device = Device(host, user=user, passwd=passwd, port=port, self.device = Device(host, user=user, passwd=passwd, port=port,
gather_facts=False).open() gather_facts=False, ssh_private_key_file=key_filename).open()
self.config = Config(self.device) self.config = Config(self.device)