---
lib/cli.py | 5 +++++
scripts/gnt-cluster | 7 +------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 4cd7999..cc7c21b 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -82,6 +82,7 @@ __all__ = [
"NONLIVE_OPT",
"NOSTART_OPT",
"NOSSH_KEYCHECK_OPT",
+ "NOVOTING_OPT",
"NWSYNC_OPT",
"ON_PRIMARY_OPT",
"ON_SECONDARY_OPT",
@@ -747,6 +748,10 @@ VG_NAME_OPT = cli_option("-g", "--vg-name", dest="vg_name",
YES_DOIT_OPT = cli_option("--yes-do-it", dest="yes_do_it",
help="Destroy cluster", action="store_true")
+NOVOTING_OPT = cli_option("--no-voting", dest="no_voting",
+ help="Skip node agreement check (dangerous)",
+ action="store_true", default=False)
+
def _ParseArgs(argv, commands, aliases):
"""Parser for the command line arguments.
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 5e74e85..e931032 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -651,12 +651,7 @@ commands = {
"", "Does a check on the cluster disk status"),
'repair-disk-sizes': (RepairDiskSizes, ARGS_MANY_INSTANCES, [DEBUG_OPT],
"", "Updates mismatches in recorded disk sizes"),
- 'masterfailover': (MasterFailover, ARGS_NONE, [DEBUG_OPT,
- cli_option("--no-voting", dest="no_voting",
- help="Skip node agreement check (dangerous)",
- action="store_true",
- default=False,),
- ],
+ 'masterfailover': (MasterFailover, ARGS_NONE, [DEBUG_OPT, NOVOTING_OPT],
"", "Makes the current node the master"),
'version': (ShowClusterVersion, ARGS_NONE, [DEBUG_OPT],
"", "Shows the cluster version"),
--
1.6.3.3
