Fix passwordless workflow (#55441)

6 years ago · 9f830b77fc
parent de8ce08fd8
commit 9f830b77fc
1 changed files with 4 additions and 3 deletions
--- a/lib/ansible/modules/network/nxos/nxos_file_copy.py
+++ b/lib/ansible/modules/network/nxos/nxos_file_copy.py
@ -288,10 +288,11 @@ 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')
+        if index == 1:
            child.sendline(password)
            child.expect('#')
        ldir = '/'