---
lib/cli.py | 7 +++++++
scripts/gnt-instance | 9 +--------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index e58d951..3412165 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -61,6 +61,7 @@ __all__ = [
"HYPERVISOR_OPT",
"IALLOCATOR_OPT",
"IGNORE_CONSIST_OPT",
+ "IGNORE_FAILURES_OPT",
"FORCE_OPT",
"NET_OPT",
"NODE_LIST_OPT",
@@ -629,6 +630,12 @@ SELECT_OS_OPT = cli_option("--select-os", dest="select_os",
help="Interactive OS reinstall, lists available"
" OS templates for selection")
+IGNORE_FAILURES_OPT = cli_option("--ignore-failures", dest="ignore_failures",
+ action="store_true", default=False,
+ help="Remove the instance from the cluster"
+ " configuration even if there are failures"
+ " during the removal process")
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 81b50e7..bd1a33d 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1428,14 +1428,7 @@ commands = {
],
"[-f] <instance>", "Reinstall a stopped instance"),
'remove': (RemoveInstance, ARGS_ONE_INSTANCE,
- [DEBUG_OPT, FORCE_OPT,
- cli_option("--ignore-failures", dest="ignore_failures",
- action="store_true", default=False,
- help=("Remove the instance from the cluster even"
- " if there are failures during the removal"
- " process (shutdown, disk removal, etc.)")),
- SUBMIT_OPT,
- ],
+ [DEBUG_OPT, FORCE_OPT, IGNORE_FAILURES_OPT, SUBMIT_OPT],
"[-f] <instance>", "Shuts down the instance and removes it"),
'rename': (RenameInstance,
[ArgInstance(min=1, max=1), ArgHost(min=1, max=1)],
--
1.6.3.3
