Adjust the error message of setup-ssh if join check fails

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/tools/setup-ssh b/tools/setup-ssh
index 9dfab38..4bc63ba 100755 (executable)
--- 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",