Revision 1b7761fd lib/client/gnt_node.py

b/lib/client/gnt_node.py
338 338
  jex = JobExecutor(cl=cl, opts=opts)
339 339
  for iname in pinst:
340 340
    op = opcodes.OpInstanceFailover(instance_name=iname,
341
                                    ignore_consistency=opts.ignore_consistency)
341
                                    ignore_consistency=opts.ignore_consistency,
342
                                    iallocator=opts.iallocator)
342 343
    jex.QueueJob(iname, op)
343 344
  results = jex.GetResults()
344 345
  bad_cnt = len([row for row in results if not row[0]])
......
380 381
    mode = constants.HT_MIGRATION_NONLIVE
381 382
  else:
382 383
    mode = opts.migration_mode
383
  op = opcodes.OpNodeMigrate(node_name=args[0], mode=mode)
384
  op = opcodes.OpNodeMigrate(node_name=args[0], mode=mode,
385
                             iallocator=opts.iallocator)
384 386
  SubmitOpCode(op, cl=cl, opts=opts)
385 387

  
386 388

  
......
815 817
    "Relocate the secondary instances from a node"
816 818
    " to other nodes (only for instances with drbd disk template)"),
817 819
  'failover': (
818
    FailoverNode, ARGS_ONE_NODE, [FORCE_OPT, IGNORE_CONSIST_OPT, PRIORITY_OPT],
820
    FailoverNode, ARGS_ONE_NODE, [FORCE_OPT, IGNORE_CONSIST_OPT,
821
                                  IALLOCATOR_OPT, PRIORITY_OPT],
819 822
    "[-f] <node>",
820 823
    "Stops the primary instances on a node and start them on their"
821 824
    " secondary node (only for instances with drbd disk template)"),
822 825
  'migrate': (
823 826
    MigrateNode, ARGS_ONE_NODE,
824
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT, PRIORITY_OPT],
827
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT,
828
     IALLOCATOR_OPT, PRIORITY_OPT],
825 829
    "[-f] <node>",
826 830
    "Migrate all the primary instance on a node away from it"
827 831
    " (only for instances of type drbd)"),

Also available in: Unified diff