From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 16 Apr 2019 15:35:39 +0000 (-0400)
Subject: util/ssh remoto now returns strings, not bytes on Python 3
X-Git-Tag: v2.1.0~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F485%2Fhead;p=ceph-deploy.git

util/ssh remoto now returns strings, not bytes on Python 3

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: rm#39322
---

diff --git a/ceph_deploy/util/ssh.py b/ceph_deploy/util/ssh.py
index 7c48d9c..5576371 100644
--- a/ceph_deploy/util/ssh.py
+++ b/ceph_deploy/util/ssh.py
@@ -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: