Revision bb851c63

b/NEWS
72 72
- Fixed the handling of a corner case when the Python installation gets
73 73
  corrupted (e.g. a bad disk) while ganeti-noded is running and we try
74 74
  to execute a command that doesn't exist
75
- Fixed a bug in ``gnt-instance move`` (LUInstanceMove) when the primary
76
  node of the instance returned failures during instance shutdown; this
77
  adds the option ``--ignore-consistency`` to gnt-instance move
75 78

  
76 79
And as usual, various improvements to the error messages, documentation
77 80
and man pages.
b/lib/client/gnt_instance.py
883 883

  
884 884
  op = opcodes.OpInstanceMove(instance_name=instance_name,
885 885
                              target_node=opts.node,
886
                              shutdown_timeout=opts.shutdown_timeout)
886
                              shutdown_timeout=opts.shutdown_timeout,
887
                              ignore_consistency=opts.ignore_consistency)
887 888
  SubmitOrSend(op, opts, cl=cl)
888 889
  return 0
889 890

  
......
1399 1400
  'move': (
1400 1401
    MoveInstance, ARGS_ONE_INSTANCE,
1401 1402
    [FORCE_OPT, SUBMIT_OPT, SINGLE_NODE_OPT, SHUTDOWN_TIMEOUT_OPT,
1402
     DRY_RUN_OPT, PRIORITY_OPT],
1403
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_CONSIST_OPT],
1403 1404
    "[-f] <instance>", "Move instance to an arbitrary node"
1404 1405
    " (only for instances of type file and lv)"),
1405 1406
  'info': (
b/lib/opcodes.py
919 919
  OP_PARAMS = [
920 920
    _PInstanceName,
921 921
    _PShutdownTimeout,
922
    _PIgnoreConsistency,
922 923
    ("target_node", ht.NoDefault, ht.TNonEmptyString),
923 924
    ]
924 925

  
b/man/gnt-instance.rst
1456 1456
MOVE
1457 1457
^^^^
1458 1458

  
1459
**move** [-f] [-n *node*] [--shutdown-timeout=*N*] [--submit]
1459
**move** [-f] [--ignore-consistency]
1460
[-n *node*] [--shutdown-timeout=*N*] [--submit]
1460 1461
{*instance*}
1461 1462

  
1462 1463
Move will move the instance to an arbitrary node in the cluster.  This
......
1471 1472
kvm process for KVM, etc.). By default two minutes are given to each
1472 1473
instance to stop.
1473 1474

  
1475
The ``--ignore-consistency`` option will make Ganeti ignore any errors
1476
in trying to shutdown the instance on its node; useful if the
1477
hypervisor is broken and you want to recuperate the data.
1478

  
1474 1479
The ``--submit`` option is used to send the job to the master daemon
1475 1480
but not wait for its completion. The job ID will be shown so that it
1476 1481
can be examined via **gnt-job info**.

Also available in: Unified diff