From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Tue, 12 Nov 2013 16:42:54 +0000 (-0500)
Subject: be more lenient in correct error detection
X-Git-Tag: v1.3.2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c6ef577d40267595a77a31bbae8c6263424cd7e;p=ceph-deploy.git

be more lenient in correct error detection

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/util/ssh.py b/ceph_deploy/util/ssh.py
index 6bcca04..3d38998 100644
--- a/ceph_deploy/util/ssh.py
+++ b/ceph_deploy/util/ssh.py
@@ -21,7 +21,7 @@ def can_connect_passwordless(hostname):
         # Check to see if we can login, disabling password prompts
         command = ['ssh', '-CT', '-o', 'BatchMode=yes', hostname]
         out, err, retval = process.check(conn, command, stop_on_error=False)
-        expected_error = 'Permission denied (publickey,password)'
+        expected_error = 'Permission denied '
         has_key_error = False
         for line in err:
             if expected_error in line: