From fcdde7f2f0d1912ebc53892ea5659f6aa0a6ae2a Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 17 Sep 2009 13:46:54 +0200
Subject: [PATCH] =?UTF-8?q?Move=20the=20=E2=80=9C--no-ssh-key-check?=
=?UTF-8?q?=E2=80=9D=20option=20to=20cli.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cli.py | 5 +++++
scripts/gnt-node | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 90cd23ab4..798f866fd 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -74,6 +74,7 @@ __all__ = [
"NONICS_OPT",
"NONLIVE_OPT",
"NOSTART_OPT",
+ "NOSSH_KEYCHECK_OPT",
"NWSYNC_OPT",
"ON_PRIMARY_OPT",
"ON_SECONDARY_OPT",
@@ -686,6 +687,10 @@ READD_OPT = cli_option("--readd", dest="readd",
default=False, action="store_true",
help="Readd old node after replacing it")
+NOSSH_KEYCHECK_OPT = cli_option("--no-ssh-key-check", dest="ssh_key_check",
+ default=True, action="store_false",
+ help="Disable SSH key fingerprint checking")
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-node b/scripts/gnt-node
index 61b86f1b3..ffaf8af84 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -626,9 +626,7 @@ commands = {
[DEBUG_OPT,
SECONDARY_IP_OPT,
READD_OPT,
- cli_option("--no-ssh-key-check", dest="ssh_key_check",
- default=True, action="store_false",
- help="Disable SSH key fingerprint checking"),
+ NOSSH_KEYCHECK_OPT,
],
"[-s ip] [--readd] [--no-ssh-key-check] <node_name>",
"Add a node to the cluster"),
--
GitLab