Update for SSH design: Cluster name, ignore node daemon

[ganeti-local] / tools / setup-ssh

diff --git a/tools/setup-ssh b/tools/setup-ssh
index 4e09078..dc2a745 100755 (executable)
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -47,6 +47,7 @@ from ganeti import netutils
 from ganeti import ssconf
 from ganeti import ssh
 from ganeti import utils
+from ganeti import pathutils
 
 
 class RemoteCommandError(errors.GenericError):
@@ -89,7 +90,7 @@ def _CheckJoin(transport):
   ss_cluster_name_path = ss.KeyToFilename(constants.SS_CLUSTER_NAME)
 
   cluster_files = [
-    (constants.NODED_CERT_FILE, utils.ReadFile(constants.NODED_CERT_FILE)),
+    (pathutils.NODED_CERT_FILE, utils.ReadFile(pathutils.NODED_CERT_FILE)),
     (ss_cluster_name_path, utils.ReadFile(ss_cluster_name_path)),
     ]
 
@@ -141,7 +142,7 @@ def _InvokeDaemonUtil(transport, command):
   @param command: The daemon-util command to be run
 
   """
-  _RunRemoteCommand(transport, "%s %s" % (constants.DAEMON_UTIL, command))
+  _RunRemoteCommand(transport, "%s %s" % (pathutils.DAEMON_UTIL, command))
 
 
 def _ReadSftpFile(sftp, filename):
@@ -182,12 +183,12 @@ def SetupSSH(transport):
   @param transport: The paramiko transport instance
 
   """
-  priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
+  priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.SSH_LOGIN_USER)
   keyfiles = [
-    (constants.SSH_HOST_DSA_PRIV, 0600),
-    (constants.SSH_HOST_DSA_PUB, 0644),
-    (constants.SSH_HOST_RSA_PRIV, 0600),
-    (constants.SSH_HOST_RSA_PUB, 0644),
+    (pathutils.SSH_HOST_DSA_PRIV, 0600),
+    (pathutils.SSH_HOST_DSA_PUB, 0644),
+    (pathutils.SSH_HOST_RSA_PRIV, 0600),
+    (pathutils.SSH_HOST_RSA_PUB, 0644),
     (priv_key, 0600),
     (pub_key, 0644),
     ]
@@ -233,13 +234,13 @@ def ParseOptions():
 
   """
   program = os.path.basename(sys.argv[0])
+  (default_key, _, _) = ssh.GetUserFiles(constants.SSH_LOGIN_USER)
 
   parser = optparse.OptionParser(usage=("%prog [--debug|--verbose] [--force]"
                                         " <node> <node...>"), prog=program)
   parser.add_option(cli.DEBUG_OPT)
   parser.add_option(cli.VERBOSE_OPT)
   parser.add_option(cli.NOSSH_KEYCHECK_OPT)
-  default_key = ssh.GetUserFiles(constants.GANETI_RUNAS)[0]
   parser.add_option(optparse.Option("-f", dest="private_key",
                                     default=default_key,
                                     help="The private key to (try to) use for"
@@ -273,7 +274,7 @@ def SetupLogging(options):
 
   formatter = logging.Formatter(fmt)
 
-  file_handler = logging.FileHandler(constants.LOG_SETUP_SSH)
+  file_handler = logging.FileHandler(pathutils.LOG_SETUP_SSH)
   stderr_handler = logging.StreamHandler()
   stderr_handler.setFormatter(formatter)
   file_handler.setFormatter(formatter)
@@ -381,7 +382,7 @@ def LoadKnownHosts():
   @return: paramiko.util.load_host_keys dict
 
   """
-  homedir = utils.GetHomeDir(constants.GANETI_RUNAS)
+  homedir = utils.GetHomeDir(constants.SSH_LOGIN_USER)
   known_hosts = os.path.join(homedir, ".ssh", "known_hosts")
 
   try:
@@ -428,7 +429,7 @@ def main():
   all_keys = LoadPrivateKeys(options)
 
   passwd = None
-  username = constants.GANETI_RUNAS
+  username = constants.SSH_LOGIN_USER
   ssh_port = netutils.GetDaemonPort("ssh")
   host_keys = LoadKnownHosts()