On Thu, Sep 17, 2009 at 03:21:44PM +0100, Michael Hanselmann wrote:
> 2009/9/17 Iustin Pop <[email protected]>:
> >  lib/cli.py           |    6 ++++++
> >  scripts/gnt-instance |    6 +-----
> >  scripts/gnt-node     |    7 +------
> >  3 files changed, 8 insertions(+), 11 deletions(-)
> 
> LGTM

Unfortunately another broken patch: node evacuate expects dst_node,
replacedisks new_secondary. I modified the patch to have the option
destination=dst_node, and modified ReplaceDisks to use that.

Interdiff:

diff --git a/lib/cli.py b/lib/cli.py
index 325bbbd..2cc8175 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -669,7 +669,7 @@ IGNORE_FAILURES_OPT = cli_option("--ignore-failures", 
dest="ignore_failures",
                                  " configuration even if there are failures"
                                  " during the removal process")
 
-NEW_SECONDARY_OPT = cli_option("-n", "--new-secondary", dest="new_secondary",
+NEW_SECONDARY_OPT = cli_option("-n", "--new-secondary", dest="dst_node",
                                help="Specifies the new secondary node",
                                metavar="NODE", default=None,
                                completion_suggest=OPT_COMPL_ONE_NODE)
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 31997a5..3aa2eb9 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -845,7 +845,7 @@ def ReplaceDisks(opts, args):
 
   """
   instance_name = args[0]
-  new_2ndary = opts.new_secondary
+  new_2ndary = opts.dst_node
   iallocator = opts.iallocator
   if opts.disks is None:
     disks = []

-- 
iustin

Reply via email to