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

Fix passwordless workflow (#55441)

Browse source 
(cherry picked from commit 9f830b77fc)
This commit is contained in:
Mike Wiebe 2019-05-02 08:36:25 -04:00 committed by Toshio Kuratomi
parent a85461e569
commit c8037a541e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/nxos_file_copy_fix.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- nxos_file_copy fix passwordless workflow (https://github.com/ansible/ansible/pull/55441).

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

@ -288,12 +288,13 @@ def copy_file_from_remote(module, local, local_file_directory, file_system='boot
try:
child = pexpect.spawn('ssh ' + username + '@' + hostname + ' -p' + str(port))
# response could be unknown host addition or Password
index = child.expect(['yes', '(?i)Password'])
index = child.expect(['yes', '(?i)Password', '#'])
if index == 0:
child.sendline('yes')
child.expect('(?i)Password')
child.sendline(password)
child.expect('#')
if index == 1:
child.sendline(password)
child.expect('#')
ldir = '/'
if local_file_directory:
dir_array = local_file_directory.split('/')