Fix passwordless workflow (ansible#55441)

(cherry picked from commit 9f830b7)
trishnaguha · May 8, 2019 · e3b3deb · e3b3deb
1 parent 0829325
commit e3b3deb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelogs/fragments/nxos_file_copy_fix.yaml b/changelogs/fragments/nxos_file_copy_fix.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+- nxos_file_copy fix passwordless workflow (https://github.com/ansible/ansible/pull/55441).
diff --git a/lib/ansible/modules/network/nxos/nxos_file_copy.py b/lib/ansible/modules/network/nxos/nxos_file_copy.py
@@ -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('/')