From 3007901ba821839b94bb163ef7889f4a87fdba93 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 24 Jun 2010 04:11:57 +0100 Subject: Fix for mpi cpu reporting --- nova/endpoint/cloud.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index b947f0833..434fc5a5f 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -37,6 +37,7 @@ from nova.auth import rbac from nova.auth import users from nova.compute import model from nova.compute import network +from nova.compute import node from nova.endpoint import images from nova.volume import storage @@ -100,7 +101,7 @@ class CloudController(object): result = {} for instance in self.instdir.all: if instance['project_id'] == project_id: - line = '%s slots=%d' % (instance['private_dns_name'], instance.get('vcpus', 0)) + line = '%s slots=%d' % (instance['private_dns_name'], node.INSTANCE_TYPES[instance['instance_type']]['vcpus']) if instance['key_name'] in result: result[instance['key_name']].append(line) else: -- cgit