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

fix nxos_file_copy and provider getting set to None when transport is cli (#30262)

Browse source 
* nxos_file_copy bug fix

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* provider gets set to None in module level when transport is cli

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha 2017-09-13 16:36:41 +05:30 committed by GitHub
parent d8371cec91
commit 578ae3b238
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/network/nxos/nxos_file_copy.py
View file

@ -61,9 +61,8 @@ options:
EXAMPLES = ''' EXAMPLES = '''
- nxos_file_copy: - nxos_file_copy:
local_file: "./test_file.txt" local_file: "./test_file.txt"
username: "{{ un }}" remote_file: "test_file.txt"
password: "{{ pwd }}" provider: "{{ cli }}"
host: "{{ inventory_hostname }}"
''' '''
RETURN = ''' RETURN = '''
@ -144,9 +143,11 @@ def transfer_file(module, dest):
if not enough_space(module): if not enough_space(module):
module.fail_json(msg='Could not transfer file. Not enough space on device.') module.fail_json(msg='Could not transfer file. Not enough space on device.')
hostname = module.params['host'] provider = module.params['provider']
username = module.params['username']
password = module.params['password'] hostname = module.params.get('host') or provider.get('host')
username = module.params.get('username') or provider.get('username')
password = module.params.get('password') or provider.get('password')
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())

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

@ -59,13 +59,6 @@ class ActionModule(_ActionModule):
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT) pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
self._task.args['provider'] = provider.update(
host=pc.remote_addr,
port=pc.port,
username=pc.remote_user,
password=pc.password,
ssh_keyfile=pc.private_key_file
)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)