projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use hvparams in GetAllInstancesInfo
[ganeti-local]
/
lib
/
cmdlib
/
instance_query.py
diff --git
a/lib/cmdlib/instance_query.py
b/lib/cmdlib/instance_query.py
index
d8c5363
..
792e777
100644
(file)
--- a/
lib/cmdlib/instance_query.py
+++ b/
lib/cmdlib/instance_query.py
@@
-115,7
+115,8
@@
class InstanceQuery(QueryBase):
# Gather data as requested
if self.requested_data & set([query.IQ_LIVE, query.IQ_CONSOLE]):
live_data = {}
# Gather data as requested
if self.requested_data & set([query.IQ_LIVE, query.IQ_CONSOLE]):
live_data = {}
- node_data = lu.rpc.call_all_instances_info(nodes, hv_list)
+ node_data = lu.rpc.call_all_instances_info(nodes, hv_list,
+ cluster.hvparams)
for name in nodes:
result = node_data[name]
if result.offline:
for name in nodes:
result = node_data[name]
if result.offline:
@@
-355,6
+356,7
@@
class LUInstanceQueryData(NoHooksLU):
"children": dev_children,
"mode": dev.mode,
"size": dev.size,
"children": dev_children,
"mode": dev.mode,
"size": dev.size,
+ "spindles": dev.spindles,
"name": dev.name,
"uuid": dev.uuid,
}
"name": dev.name,
"uuid": dev.uuid,
}
@@
-382,9
+384,9
@@
class LUInstanceQueryData(NoHooksLU):
" information only for instance %s" %
(pnode.name, instance.name))
else:
" information only for instance %s" %
(pnode.name, instance.name))
else:
- remote_info = self.rpc.call_instance_info(instance.primary_node,
- instance.name,
- instance.hypervisor)
+ remote_info = self.rpc.call_instance_info(
+ instance.primary_node, instance.name, instance.hypervisor,
+ cluster.hvparams[instance.hypervisor])
remote_info.Raise("Error checking node %s" % instance.primary_node)
remote_info = remote_info.payload
if remote_info and "state" in remote_info:
remote_info.Raise("Error checking node %s" % instance.primary_node)
remote_info = remote_info.payload
if remote_info and "state" in remote_info: