From e389d95b3bc0863e338757856d8626121936c669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Thu, 21 Oct 2010 15:01:32 +0200
Subject: [PATCH] Adjust the error message of setup-ssh if join check fails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
tools/setup-ssh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/setup-ssh b/tools/setup-ssh
index 9dfab3843..4bc63bab8 100755
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -442,7 +442,10 @@ def main():
logging.warning("Host %s failed join check, forced to continue",
host)
else:
- raise JoinCheckError("Host %s failed join check" % host)
+ raise JoinCheckError(("Host %s failed join check; Please verify"
+ " that the host was not previously joined"
+ " to another cluster and use --force-join"
+ " to continue") % host)
SetupSSH(transport)
except errors.GenericError, err:
logging.error("While doing setup on host %s an error occurred: %s",
--
GitLab