diff --git a/lib/constants.py b/lib/constants.py index 5beb6abecf83ca40bc7054fe2068dba8b56d43f3..b0745ec92458671641739d180ffb27f99aaf65b3 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -2060,5 +2060,11 @@ SSHS_SSH_HOST_KEY = "ssh_host_key" SSHS_SSH_ROOT_KEY = "ssh_root_key" SSHS_NODE_DAEMON_CERTIFICATE = "node_daemon_certificate" +#: Key files for SSH daemon +SSH_DAEMON_KEYFILES = { + SSHK_RSA: (pathutils.SSH_HOST_RSA_PRIV, pathutils.SSH_HOST_RSA_PUB), + SSHK_DSA: (pathutils.SSH_HOST_DSA_PRIV, pathutils.SSH_HOST_DSA_PUB), + } + # Do not re-export imported modules del re, _vcsversion, _autoconf, socket, pathutils diff --git a/lib/tools/prepare_node_join.py b/lib/tools/prepare_node_join.py index e9e9f77b71654d74b7e00098d770b2230e4b6392..e8f7c8d67beaf444c34491c06caef13d00b7e248 100644 --- a/lib/tools/prepare_node_join.py +++ b/lib/tools/prepare_node_join.py @@ -58,13 +58,6 @@ _DATA_CHECK = ht.TStrictDict(False, True, { constants.SSHS_SSH_ROOT_KEY: _SSH_KEY_LIST, }) -_SSH_DAEMON_KEYFILES = { - constants.SSHK_RSA: - (pathutils.SSH_HOST_RSA_PRIV, pathutils.SSH_HOST_RSA_PUB), - constants.SSHK_DSA: - (pathutils.SSH_HOST_DSA_PRIV, pathutils.SSH_HOST_DSA_PUB), - } - class JoinError(errors.GenericError): """Local class for reporting errors. @@ -258,7 +251,7 @@ def UpdateSshDaemon(data, dry_run, _runcmd_fn=utils.RunCmd, return if _keyfiles is None: - _keyfiles = _SSH_DAEMON_KEYFILES + _keyfiles = constants.SSH_DAEMON_KEYFILES logging.info("Updating SSH daemon key files") _UpdateKeyFiles(keys, dry_run, _keyfiles)