diff --git a/lib/cli.py b/lib/cli.py index 4f2dfef561111ea6c65c6834cba1ff757ad4563f..ae17be75698a68c91e8cd1d4a8e0760dc39e9f73 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -69,6 +69,7 @@ __all__ = [ "IALLOCATOR_OPT", "IGNORE_CONSIST_OPT", "IGNORE_FAILURES_OPT", + "IGNORE_SECONDARIES_OPT", "IGNORE_SIZE_OPT", "FORCE_OPT", "MAC_PREFIX_OPT", @@ -798,6 +799,11 @@ REBOOT_TYPE_OPT = cli_option("-t", "--type", dest="reboot_type", metavar="<REBOOT>", choices=list(constants.REBOOT_TYPES)) +IGNORE_SECONDARIES_OPT = cli_option("--ignore-secondaries", + dest="ignore_secondaries", + default=False, action="store_true", + help="Ignore errors from secondaries") + def _ParseArgs(argv, commands, aliases): """Parser for the command line arguments. diff --git a/scripts/gnt-instance b/scripts/gnt-instance index 8b1ca4e8b0a3ff62b5a7328e79009d461e45e3b1..12a290837fc8405dc04951dbc1456ab12c917d1d 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -1467,12 +1467,8 @@ commands = { "<instance>", "Starts an instance"), 'reboot': (RebootInstance, [ArgInstance(min=1)], [DEBUG_OPT, m_force_multi, REBOOT_TYPE_OPT, - cli_option("--ignore-secondaries", dest="ignore_secondaries", - default=False, action="store_true", - help="Ignore errors from secondaries"), - m_node_opt, m_pri_node_opt, m_sec_node_opt, - m_clust_opt, m_inst_opt, - SUBMIT_OPT, + IGNORE_SECONDARIES_OPT, m_node_opt, m_pri_node_opt, + m_sec_node_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT, ], "<instance>", "Reboots an instance"), 'activate-disks': (ActivateDisks, ARGS_ONE_INSTANCE,