From d1ab11f225470c0453070efe9ae577f41f93bfb1 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 21 Feb 2013 18:43:28 +0100
Subject: [PATCH] constants: Use SSH constant for daemon ports
Moving the SSH/SCP constants around was necessary for this.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---
lib/constants.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index 74720fd99..31bd688c7 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -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"
--
GitLab