From 5ec23388cce4553bc253b995227f9abcb7bc1b38 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Mon, 19 Mar 2012 10:17:39 +0100 Subject: [PATCH] Update gnt-node evacuate man page/help text 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: RenΓ© Nussbaumer <rn@google.com> --- lib/client/gnt_node.py | 2 +- man/gnt-node.rst | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py index e8312211a..38251f42b 100644 --- a/lib/client/gnt_node.py +++ b/lib/client/gnt_node.py @@ -889,7 +889,7 @@ commands = { EvacuateNode, ARGS_ONE_NODE, [FORCE_OPT, IALLOCATOR_OPT, NEW_SECONDARY_OPT, EARLY_RELEASE_OPT, PRIORITY_OPT, PRIMARY_ONLY_OPT, SECONDARY_ONLY_OPT], - "[-f] {-I <iallocator> | -n <dst>} <node>", + "[-f] {-I <iallocator> | -n <dst>} [-p | -s] [options...] <node>", "Relocate the primary and/or secondary instances from a node"), "failover": ( FailoverNode, ARGS_ONE_NODE, [FORCE_OPT, IGNORE_CONSIST_OPT, diff --git a/man/gnt-node.rst b/man/gnt-node.rst index b8cc2affb..406573763 100644 --- a/man/gnt-node.rst +++ b/man/gnt-node.rst @@ -95,9 +95,10 @@ interpreted as stdin. EVACUATE ~~~~~~~~ -**evacuate** [-f] [\--early-release] [\--iallocator *NAME* \| -\--new-secondary *destination\_node*] -[\--primary-only \| \--secondary-only] [\--early-release] {*node*} +| **evacuate** [-f] [\--early-release] +| [{-I|\--iallocator} *NAME* \| {-n|\--new-secondary} *destination\_node*] +| [{-p|\--primary-only} \| {-s|\--secondary-only} ] +| {*node*} This command will move instances away from the given node. If ``--primary-only`` is given, only primary instances are evacuated, with -- GitLab