ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-30 04:00:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixes nxos nxapi implementation (#21615)

Browse source 
* correctly maps play_context to nxapi values
* fixes bug in nxos_nxapi module detecting nxapi feature
* updates nxos shared lib provider values
* fixes missing ssh_keyfile in nxos shared lib
This commit is contained in:
Peter Sprygada 2017-02-18 11:20:26 -05:00 • committed by GitHub
parent eb6956e1dd
commit 920f9f4815
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/plugins/action/nxos.py
View file

@ -57,6 +57,8 @@ class ActionModule(_ActionModule):
pc.port = provider['port'] or self._play_context.port or 22
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or self._play_context.timeout
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
@ -71,18 +73,16 @@ class ActionModule(_ActionModule):
task_vars['ansible_socket'] = socket_path
else:
if provider['host'] is None:
self._task.args['host'] = self._play_context.remote_addr
if provider['username'] is None:
self._task.args['username'] = self._play_context.connection_user
if provider['password'] is None:
self._task.args['password'] = self._play_context.password
if provider['timeout'] is None:
self._task.args['timeout'] = self._play_context.timeout
if task_vars.get('nxapi_use_ssl'):
self._task.args['use_ssl'] = task_vars['nxapi_use_ssl']
if task_vars.get('nxapi_validate_certs'):
self._task.args['validate_certs'] = task_vars['nxapi_validate_certs']
provider_arg = {
'host': self._play_context.remote_addr,
'port': provider.get('port'),
'username': provider.get('username') or self._play_context.connection_user,
'password': provider.get('password') or self._play_context.password,
'timeout': provider.get('timeout') or self._play_context.timeout,
'use_ssl': task_vars.get('nxapi_use_ssl') or False,
'validate_certs': task_vars.get('nxapi_validate_certs') or True
}
self._task.args['provider'] = provider_arg
result = super(ActionModule, self).run(tmp, task_vars)