Drop SSHS_FORCE constant

It is not actually used.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index 35cf53b..5beb6ab 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -2056,7 +2056,6 @@ SSHAK_ALL = frozenset([SSHAK_RSA, SSHAK_DSS])
 
 # SSH setup
 SSHS_CLUSTER_NAME = "cluster_name"
-SSHS_FORCE = "force"
 SSHS_SSH_HOST_KEY = "ssh_host_key"
 SSHS_SSH_ROOT_KEY = "ssh_root_key"
 SSHS_NODE_DAEMON_CERTIFICATE = "node_daemon_certificate"

diff --git a/lib/tools/prepare_node_join.py b/lib/tools/prepare_node_join.py
index ec93568..b1270f5 100644 (file)
--- a/lib/tools/prepare_node_join.py
+++ b/lib/tools/prepare_node_join.py
@@ -53,7 +53,6 @@ _SSH_KEY_LIST = ht.TListOf(_SSH_KEY_LIST_ITEM)
 
 _DATA_CHECK = ht.TStrictDict(False, True, {
   constants.SSHS_CLUSTER_NAME: ht.TNonEmptyString,
-  constants.SSHS_FORCE: ht.TBool,
   constants.SSHS_NODE_DAEMON_CERTIFICATE: ht.TNonEmptyString,
   constants.SSHS_SSH_HOST_KEY: _SSH_KEY_LIST,
   constants.SSHS_SSH_ROOT_KEY: _SSH_KEY_LIST,