Revision 07813a9e lib/cmdlib.py

b/lib/cmdlib.py
2720 2720
    """
2721 2721
    instance = self.instance
2722 2722
    force = self.op.force
2723
    extra_args = getattr(self.op, "extra_args", "")
2724 2723

  
2725 2724
    self.cfg.MarkInstanceUp(instance.name)
2726 2725

  
......
2728 2727

  
2729 2728
    _StartInstanceDisks(self, instance, force)
2730 2729

  
2731
    result = self.rpc.call_instance_start(node_current, instance, extra_args)
2730
    result = self.rpc.call_instance_start(node_current, instance)
2732 2731
    msg = result.RemoteFailMsg()
2733 2732
    if msg:
2734 2733
      _ShutdownInstanceDisks(self, instance)
......
2789 2788
    instance = self.instance
2790 2789
    ignore_secondaries = self.op.ignore_secondaries
2791 2790
    reboot_type = self.op.reboot_type
2792
    extra_args = getattr(self.op, "extra_args", "")
2793 2791

  
2794 2792
    node_current = instance.primary_node
2795 2793

  
......
2798 2796
      for disk in instance.disks:
2799 2797
        self.cfg.SetDiskID(disk, node_current)
2800 2798
      result = self.rpc.call_instance_reboot(node_current, instance,
2801
                                             reboot_type, extra_args)
2799
                                             reboot_type)
2802 2800
      msg = result.RemoteFailMsg()
2803 2801
      if msg:
2804 2802
        raise errors.OpExecError("Could not reboot instance: %s" % msg)
......
2810 2808
                                 " full reboot: %s" % msg)
2811 2809
      _ShutdownInstanceDisks(self, instance)
2812 2810
      _StartInstanceDisks(self, instance, ignore_secondaries)
2813
      result = self.rpc.call_instance_start(node_current, instance, extra_args)
2811
      result = self.rpc.call_instance_start(node_current, instance)
2814 2812
      msg = result.RemoteFailMsg()
2815 2813
      if msg:
2816 2814
        _ShutdownInstanceDisks(self, instance)
......
3500 3498
        raise errors.OpExecError("Can't activate the instance's disks")
3501 3499

  
3502 3500
      feedback_fn("* starting the instance on the target node")
3503
      result = self.rpc.call_instance_start(target_node, instance, None)
3501
      result = self.rpc.call_instance_start(target_node, instance)
3504 3502
      msg = result.RemoteFailMsg()
3505 3503
      if msg:
3506 3504
        _ShutdownInstanceDisks(self, instance)
......
4741 4739
      self.cfg.Update(iobj)
4742 4740
      logging.info("Starting instance %s on node %s", instance, pnode_name)
4743 4741
      feedback_fn("* starting instance...")
4744
      result = self.rpc.call_instance_start(pnode_name, iobj, None)
4742
      result = self.rpc.call_instance_start(pnode_name, iobj)
4745 4743
      msg = result.RemoteFailMsg()
4746 4744
      if msg:
4747 4745
        raise errors.OpExecError("Could not start instance: %s" % msg)
......
6189 6187

  
6190 6188
    finally:
6191 6189
      if self.op.shutdown and instance.admin_up:
6192
        result = self.rpc.call_instance_start(src_node, instance, None)
6190
        result = self.rpc.call_instance_start(src_node, instance)
6193 6191
        msg = result.RemoteFailMsg()
6194 6192
        if msg:
6195 6193
          _ShutdownInstanceDisks(self, instance)

Also available in: Unified diff