Revision 24a40d57 lib/cmdlib.py

b/lib/cmdlib.py
2527 2527
                (instance.name, source_node))
2528 2528

  
2529 2529
    if not rpc.call_instance_shutdown(source_node, instance):
2530
      logger.Error("Could not shutdown instance %s on node %s. Proceeding"
2531
                   " anyway. Please make sure node %s is down"  %
2532
                   (instance.name, source_node, source_node))
2530
      if self.op.ignore_consistency:
2531
        logger.Error("Could not shutdown instance %s on node %s. Proceeding"
2532
                     " anyway. Please make sure node %s is down"  %
2533
                     (instance.name, source_node, source_node))
2534
      else:
2535
        raise errors.OpExecError("Could not shutdown instance %s on node %s" %
2536
                                 (instance.name, source_node))
2533 2537

  
2534 2538
    feedback_fn("* deactivating the instance's disks on source node")
2535 2539
    if not _ShutdownInstanceDisks(instance, self.cfg, ignore_primary=True):

Also available in: Unified diff