LUNodeQueryStorage: Acquire all locks in shared mode

[ganeti-local] / lib / bootstrap.py

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index a7c8653..2f6f985 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -289,7 +289,8 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913
                 hvparams=None, enabled_hypervisors=None, modify_etc_hosts=True,
                 modify_ssh_setup=True, maintain_node_health=False,
                 drbd_helper=None, uid_pool=None, default_iallocator=None,
-                primary_ip_version=None, prealloc_wipe_disks=False):
+                primary_ip_version=None, prealloc_wipe_disks=False,
+                use_external_mip_script=False):
   """Initialise the cluster.
 
   @type candidate_pool_size: int
@@ -482,6 +483,7 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913
     default_iallocator=default_iallocator,
     primary_ip_family=ipcls.family,
     prealloc_wipe_disks=prealloc_wipe_disks,
+    use_external_mip_script=use_external_mip_script,
     )
   master_node_config = objects.Node(name=hostname.name,
                                     primary_ip=hostname.ip,
@@ -567,8 +569,12 @@ def FinalizeClusterDestroy(master):
   modify_ssh_setup = cfg.GetClusterInfo().modify_ssh_setup
   runner = rpc.BootstrapRunner()
 
-  (_, ip, netdev, netmask, _) = cfg.GetMasterNetworkParameters()
-  result = runner.call_node_deactivate_master_ip(master, ip, netmask, netdev)
+  master_params = cfg.GetMasterNetworkParameters()
+  master_params.name = master
+  ems = cfg.GetUseExternalMipScript()
+  result = runner.call_node_deactivate_master_ip(master_params.name,
+                                                 master_params, ems)
+
   msg = result.fail_msg
   if msg:
     logging.warning("Could not disable the master IP: %s", msg)
@@ -707,9 +713,12 @@ def MasterFailover(no_voting=False):
   logging.info("Stopping the master daemon on node %s", old_master)
 
   runner = rpc.BootstrapRunner()
-  (_, ip, netdev, netmask, _) = cfg.GetMasterNetworkParameters()
-  result = runner.call_node_deactivate_master_ip(old_master, ip, netmask,
-                                                 netdev)
+  master_params = cfg.GetMasterNetworkParameters()
+  master_params.name = old_master
+  ems = cfg.GetUseExternalMipScript()
+  result = runner.call_node_deactivate_master_ip(master_params.name,
+                                                 master_params, ems)
+
   msg = result.fail_msg
   if msg:
     logging.warning("Could not disable the master IP: %s", msg)