From f215debf3ddb9d94781929deabc141a41c7cfc8f Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 6 Nov 2012 18:52:59 +0100
Subject: [PATCH] Use SSH_LOGIN_USER rather than root for xl ssh
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/constants.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index ec5edd5e9..5bcccd9b4 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -202,10 +202,11 @@ XEN_CMD = _autoconf.XEN_CMD
# the command xl runs some extra info so that it can use Ganeti's key
# verification and not fail. Note that this string is incomplete: it must be
# filled with the cluster name before being used.
-XL_SSH_CMD = ("ssh -l root -oGlobalKnownHostsFile=%s"
+XL_SSH_CMD = ("ssh -l %s -oGlobalKnownHostsFile=%s"
" -oUserKnownHostsFile=/dev/null"
" -oCheckHostIp=no -oStrictHostKeyChecking=yes"
- " -oHostKeyAlias=%%s") % pathutils.SSH_KNOWN_HOSTS_FILE
+ " -oHostKeyAlias=%%s") % (SSH_LOGIN_USER,
+ pathutils.SSH_KNOWN_HOSTS_FILE)
KVM_PATH = _autoconf.KVM_PATH
KVM_KERNEL = _autoconf.KVM_KERNEL
--
GitLab