From f25b8f5826752913fbed6d30c92744c0e6790ead Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 27 Jan 2012 14:45:10 +0100
Subject: [PATCH] Export ndparams in iallocator
Strangely, these were not exported at all before.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cmdlib.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2c867b497..f763bf749 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -14571,7 +14571,7 @@ class IAllocator(object):
data["nodegroups"] = self._ComputeNodeGroupData(cfg)
- config_ndata = self._ComputeBasicNodeData(ninfo)
+ config_ndata = self._ComputeBasicNodeData(cfg, ninfo)
data["nodes"] = self._ComputeDynamicNodeData(ninfo, node_data, node_iinfo,
i_list, config_ndata)
assert len(data["nodes"]) == len(ninfo), \
@@ -14597,7 +14597,7 @@ class IAllocator(object):
return ng
@staticmethod
- def _ComputeBasicNodeData(node_cfg):
+ def _ComputeBasicNodeData(cfg, node_cfg):
"""Compute global node data.
@rtype: dict
@@ -14615,6 +14615,7 @@ class IAllocator(object):
"group": ninfo.group,
"master_capable": ninfo.master_capable,
"vm_capable": ninfo.vm_capable,
+ "ndparams": cfg.GetNdParams(ninfo),
})
for ninfo in node_cfg.values())
--
GitLab