From b8d0f938d28ece774e039f4d577edb49107fda17 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 17 Sep 2009 13:45:58 +0200
Subject: [PATCH] =?UTF-8?q?Move=20the=20=E2=80=9C--readd=E2=80=9D=20option?=
=?UTF-8?q?=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 affcd01c4..90cd23ab4 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -79,6 +79,7 @@ __all__ = [
"ON_SECONDARY_OPT",
"OS_OPT",
"OS_SIZE_OPT",
+ "READD_OPT",
"SECONDARY_IP_OPT",
"SELECT_OS_OPT",
"SEP_OPT",
@@ -681,6 +682,10 @@ SECONDARY_IP_OPT = cli_option("-s", "--secondary-ip", dest="secondary_ip",
help="Specify the secondary ip for the node",
metavar="ADDRESS", default=None)
+READD_OPT = cli_option("--readd", dest="readd",
+ default=False, action="store_true",
+ help="Readd old node after replacing it")
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-node b/scripts/gnt-node
index 4e5e41946..61b86f1b3 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -625,9 +625,7 @@ commands = {
'add': (AddNode, [ArgHost(min=1, max=1)],
[DEBUG_OPT,
SECONDARY_IP_OPT,
- cli_option("--readd", dest="readd",
- default=False, action="store_true",
- help="Readd old node after replacing it"),
+ READD_OPT,
cli_option("--no-ssh-key-check", dest="ssh_key_check",
default=True, action="store_false",
help="Disable SSH key fingerprint checking"),
--
GitLab