Merge branch 'stable-2.6'

[ganeti-local] / lib / bootstrap.py

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index 8c4663f..726f7c4 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -222,6 +222,8 @@ def _WaitForNodeDaemon(node_name):
 
   """
   def _CheckNodeDaemon():
+    # Pylint bug <http://www.logilab.org/ticket/35642>
+    # pylint: disable=E1101
     result = rpc.BootstrapRunner().call_version([node_name])[node_name]
     if result.fail_msg:
       raise utils.RetryAgain()
@@ -582,7 +584,7 @@ def InitConfig(version, cluster_config, master_node_config,
     uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID),
     name=constants.INITIAL_NODE_GROUP_NAME,
     members=[master_node_config.name],
-    diskparams=cluster_config.diskparams,
+    diskparams={},
     )
   nodegroups = {
     default_nodegroup.uuid: default_nodegroup,