]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
util/ssh remoto now returns strings, not bytes on Python 3 485/head
authorAlfredo Deza <adeza@redhat.com>
Tue, 16 Apr 2019 15:35:39 +0000 (11:35 -0400)
committerAlfredo Deza <adeza@redhat.com>
Tue, 16 Apr 2019 15:35:39 +0000 (11:35 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rm#39322

ceph_deploy/util/ssh.py

index 7c48d9cded551824d11f6c1a375909d4b28e50aa..557637111d8f28cdb6bd7ea6a4d25fec7d187de8 100644 (file)
@@ -20,8 +20,8 @@ def can_connect_passwordless(hostname):
         # Check to see if we can login, disabling password prompts
         command = ['ssh', '-CT', '-o', 'BatchMode=yes', hostname, 'true']
         out, err, retval = remoto.process.check(conn, command, stop_on_error=False)
-        permission_denied_error = b'Permission denied '
-        host_key_verify_error = b'Host key verification failed.'
+        permission_denied_error = 'Permission denied '
+        host_key_verify_error = 'Host key verification failed.'
         has_key_error = False
         for line in err:
             if permission_denied_error in line or host_key_verify_error in line: