Revision 3ed23330

b/lib/client/gnt_instance.py
847 847
  op = opcodes.OpInstanceMigrate(instance_name=instance_name, mode=mode,
848 848
                                 cleanup=opts.cleanup, iallocator=iallocator,
849 849
                                 target_node=target_node,
850
                                 allow_failover=opts.allow_failover)
850
                                 allow_failover=opts.allow_failover,
851
                                 ignore_ipolicy=opts.ignore_ipolicy)
851 852
  SubmitOpCode(op, cl=cl, opts=opts)
852 853
  return 0
853 854

  
......
1446 1447
  "migrate": (
1447 1448
    MigrateInstance, ARGS_ONE_INSTANCE,
1448 1449
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT, CLEANUP_OPT, DRY_RUN_OPT,
1449
     PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT, ALLOW_FAILOVER_OPT],
1450
     PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT, ALLOW_FAILOVER_OPT,
1451
     IGNORE_IPOLICY_OPT],
1450 1452
    "[-f] <instance>", "Migrate instance to its secondary node"
1451 1453
    " (only for mirrored instances)"),
1452 1454
  "move": (
b/lib/cmdlib.py
7319 7319
    self._migrater = TLMigrateInstance(self, self.op.instance_name,
7320 7320
                                       cleanup=self.op.cleanup,
7321 7321
                                       failover=False,
7322
                                       fallback=self.op.allow_failover)
7322
                                       fallback=self.op.allow_failover,
7323
                                       ignore_ipolicy=self.op.ignore_ipolicy)
7323 7324
    self.tasklets = [self._migrater]
7324 7325

  
7325 7326
  def DeclareLocks(self, level):
b/lib/opcodes.py
1262 1262
    _PMigrationMode,
1263 1263
    _PMigrationLive,
1264 1264
    _PMigrationTargetNode,
1265
    _PIgnoreIpolicy,
1265 1266
    ("cleanup", False, ht.TBool,
1266 1267
     "Whether a previously failed migration should be cleaned up"),
1267 1268
    ("iallocator", None, ht.TMaybeString,
b/man/gnt-instance.rst
1420 1420
**migrate** [-f] {--cleanup} {*instance*}
1421 1421

  
1422 1422
**migrate** [-f] [--allow-failover] [--non-live]
1423
[--migration-mode=live\|non-live] {*instance*}
1423
[--migration-mode=live\|non-live] [--ignore-ipolicy] {*instance*}
1424 1424

  
1425 1425
Migrate will move the instance to its secondary node without
1426 1426
shutdown. It only works for instances having the drbd8 disk template
......
1456 1456
instance is shut down). Please note that the fallback will not happen
1457 1457
during execution. If a migration fails during execution it still fails.
1458 1458

  
1459
If ``--ignore-ipolicy`` is given any instance policy violations occuring
1460
during this operation are ignored.
1461

  
1459 1462
Example (and expected output)::
1460 1463

  
1461 1464
    # gnt-instance migrate instance1

Also available in: Unified diff