ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fixes guess_os for netconf connections (#33671)

Browse source 
* fixes guess_os for netconf connections

This change fixes invalid calls to play_context when the network_os is
not set and the connection attempts to guess the network_os.  The method
will now check the correct values for ssh key file and allow agent
instead of returning errors.

* fix up pep8 issues
This commit is contained in:
Peter Sprygada 2017-12-07 09:47:41 -05:00 committed by Kedar Kekan
parent 012a96dabd
commit 1699a39ad0
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/plugins/connection/netconf.py
View file

@ -164,6 +164,7 @@ class Connection(ConnectionBase):
allow_agent = True allow_agent = True
if self._play_context.password is not None: if self._play_context.password is not None:
allow_agent = False allow_agent = False
setattr(self._play_context, 'allow_agent', allow_agent)
key_filename = None key_filename = None
if self._play_context.private_key_file: if self._play_context.private_key_file:
@ -195,7 +196,7 @@ class Connection(ConnectionBase):
key_filename=str(key_filename), key_filename=str(key_filename),
hostkey_verify=C.HOST_KEY_CHECKING, hostkey_verify=C.HOST_KEY_CHECKING,
look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS, look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS,
allow_agent=allow_agent, allow_agent=self._play_context.allow_agent,
timeout=self._play_context.timeout, timeout=self._play_context.timeout,
device_params={'name': network_os}, device_params={'name': network_os},
ssh_config=ssh_config ssh_config=ssh_config

4
lib/ansible/plugins/netconf/iosxr.py
View file

@ -141,10 +141,10 @@ class Netconf(NetconfBase):
port=obj._play_context.port or 830, port=obj._play_context.port or 830,
username=obj._play_context.remote_user, username=obj._play_context.remote_user,
password=obj._play_context.password, password=obj._play_context.password,
key_filename=str(obj.key_filename), key_filename=obj._play_context.private_key_file,
hostkey_verify=C.HOST_KEY_CHECKING, hostkey_verify=C.HOST_KEY_CHECKING,
look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS, look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS,
allow_agent=obj.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj._play_context.timeout
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:

4
lib/ansible/plugins/netconf/junos.py
View file

@ -107,10 +107,10 @@ class Netconf(NetconfBase):
port=obj._play_context.port or 830, port=obj._play_context.port or 830,
username=obj._play_context.remote_user, username=obj._play_context.remote_user,
password=obj._play_context.password, password=obj._play_context.password,
key_filename=str(obj.key_filename), key_filename=obj._play_context.private_key_file,
hostkey_verify=C.HOST_KEY_CHECKING, hostkey_verify=C.HOST_KEY_CHECKING,
look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS, look_for_keys=C.PARAMIKO_LOOK_FOR_KEYS,
allow_agent=obj.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj._play_context.timeout
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc: