From 8b2df5f652fa2fe2b82cf2275847e2ab9a152178 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 14 Dec 2009 18:14:31 +0100
Subject: [PATCH] Pass --fqdn to ssh hostname checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The cluster verify checks for fqdn are done via address lookups, and
there we actually use the FQDN. However, for the ssh hostname check
which is done at node add time, we rely on the default of the βhostnameβ
command. And Debian for example recently changed the default to return
the shortname unless one passes β--fqdnβ.
This patch is imported from the Debian packaging.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/ssh.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ssh.py b/lib/ssh.py
index 87c25c929..31fbdbbf6 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -212,7 +212,7 @@ class SshRunner:
- detail: string with details
"""
- retval = self.Run(node, 'root', 'hostname')
+ retval = self.Run(node, 'root', 'hostname --fqdn')
if retval.failed:
msg = "ssh problem"
--
GitLab