Commit d1ab11f2 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

constants: Use SSH constant for daemon ports



Moving the SSH/SCP constants around was necessary for this.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent a82d9394
......@@ -147,6 +147,10 @@ ENABLE_CONFD = _autoconf.ENABLE_CONFD
ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
ENABLE_RESTRICTED_COMMANDS = _autoconf.ENABLE_RESTRICTED_COMMANDS
# SSH constants
SSH = "ssh"
SCP = "scp"
NODED = "ganeti-noded"
CONFD = "ganeti-confd"
RAPI = "ganeti-rapi"
......@@ -157,7 +161,7 @@ DAEMONS_PORTS = {
NODED: ("tcp", 1811),
CONFD: ("udp", 1814),
RAPI: ("tcp", 5080),
"ssh": ("tcp", 22),
SSH: ("tcp", 22),
}
DEFAULT_NODED_PORT = DAEMONS_PORTS[NODED][1]
DEFAULT_CONFD_PORT = DAEMONS_PORTS[CONFD][1]
......@@ -722,10 +726,6 @@ ES_SCRIPTS = frozenset([
ES_PARAMETERS_FILE = "parameters.list"
# ssh constants
SSH = "ssh"
SCP = "scp"
# reboot types
INSTANCE_REBOOT_SOFT = "soft"
INSTANCE_REBOOT_HARD = "hard"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment