Revision 4d98c565

b/lib/cli.py
821 821
                         default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
822 822
                         help="Maximum time to wait")
823 823

  
824
SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout", dest="timeout",
825
                         type="int",
824
SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout",
825
                         dest="shutdown_timeout", type="int",
826 826
                         default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
827 827
                         help="Maximum time to wait for instance shutdown")
828 828

  
b/scripts/gnt-backup
73 73
  op = opcodes.OpExportInstance(instance_name=args[0],
74 74
                                target_node=opts.node,
75 75
                                shutdown=opts.shutdown,
76
                                timeout=opts.timeout)
76
                                shutdown_timeout=opts.shutdown_timeout)
77 77

  
78 78
  fin_resu, dlist = SubmitOpCode(op)
79 79
  if not isinstance(dlist, list):
b/scripts/gnt-instance
564 564

  
565 565
  op = opcodes.OpRemoveInstance(instance_name=instance_name,
566 566
                                ignore_failures=opts.ignore_failures,
567
                                timeout=opts.timeout)
567
                                shutdown_timeout=opts.shutdown_timeout)
568 568
  SubmitOrSend(op, opts, cl=cl)
569 569
  return 0
570 570

  
......
715 715
  return opcodes.OpRebootInstance(instance_name=name,
716 716
                                  reboot_type=opts.reboot_type,
717 717
                                  ignore_secondaries=opts.ignore_secondaries,
718
                                  timeout=opts.timeout)
718
                                  shutdown_timeout=opts.shutdown_timeout)
719 719

  
720 720

  
721 721
def _ShutdownInstance(name, opts):
......
806 806

  
807 807
  op = opcodes.OpFailoverInstance(instance_name=instance_name,
808 808
                                  ignore_consistency=opts.ignore_consistency,
809
                                  timeout=opts.timeout)
809
                                  shutdown_timeout=opts.shutdown_timeout)
810 810
  SubmitOrSend(op, opts, cl=cl)
811 811
  return 0
812 812

  
......
872 872

  
873 873
  op = opcodes.OpMoveInstance(instance_name=instance_name,
874 874
                              target_node=opts.node,
875
                              timeout=opts.timeout)
875
                              shutdown_timeout=opts.shutdown_timeout)
876 876
  SubmitOrSend(op, opts, cl=cl)
877 877
  return 0
878 878

  

Also available in: Unified diff