Fix passwordless workflow (#55441)

This commit is contained in:
Mike Wiebe 2019-05-02 08:36:25 -04:00 committed by Trishna Guha
parent de8ce08fd8
commit 9f830b77fc

View file

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