summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-06-24 04:11:57 +0100
committerandy <github@anarkystic.com>2010-06-24 04:11:57 +0100
commit3007901ba821839b94bb163ef7889f4a87fdba93 (patch)
tree6b0bbf21c50daa56a0d9387e9459666cac04ee01
parent38e92818f378ba8a8d9a09791e139d2fdae10ef4 (diff)
Fix for mpi cpu reporting
-rw-r--r--nova/endpoint/cloud.py3
1 files changed, 2 insertions, 1 deletions
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: