Revision f9d20654 lib/bootstrap.py

b/lib/bootstrap.py
567 567
  modify_ssh_setup = cfg.GetClusterInfo().modify_ssh_setup
568 568
  runner = rpc.BootstrapRunner()
569 569

  
570
  (_, ip, netdev, netmask, family) = cfg.GetMasterNetworkParameters()
571
  result = runner.call_node_deactivate_master_ip(master, ip, netmask, netdev,
572
                                                 family)
570
  master_params = cfg.GetMasterNetworkParameters()
571
  result = runner.call_node_deactivate_master_ip(master,
572
                                                 master_params.ip,
573
                                                 master_params.netmask,
574
                                                 master_params.netdev,
575
                                                 master_params.ip_family)
573 576
  msg = result.fail_msg
574 577
  if msg:
575 578
    logging.warning("Could not disable the master IP: %s", msg)
......
708 711
  logging.info("Stopping the master daemon on node %s", old_master)
709 712

  
710 713
  runner = rpc.BootstrapRunner()
711
  (_, ip, netdev, netmask, family) = cfg.GetMasterNetworkParameters()
712
  result = runner.call_node_deactivate_master_ip(old_master, ip, netmask,
713
                                                 netdev, family)
714
  master_params = cfg.GetMasterNetworkParameters()
715
  result = runner.call_node_deactivate_master_ip(old_master,
716
                                                 master_params.ip,
717
                                                 master_params.netmask,
718
                                                 master_params.netdev,
719
                                                 master_params.ip_family)
714 720
  msg = result.fail_msg
715 721
  if msg:
716 722
    logging.warning("Could not disable the master IP: %s", msg)

Also available in: Unified diff