summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-04-12 09:24:49 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-04-12 09:24:49 -0400
commit2738e49b48da20ba382d0cdb1afddd369c06e74f (patch)
treeb6c881c0676ff0b7bbcf000f9d395b2ca5f8e391 /nova/api
parentb2f693f63d73e3e51cb3be40b5deae720c773340 (diff)
parentaebcd4abd574b2edb8f2919cb4c2a77617eb97e9 (diff)
Merged trunk.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 651ec47f9..5e81878c4 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -142,6 +142,11 @@ class CloudController(object):
instance_ref = self.compute_api.get_all(ctxt, fixed_ip=address)
if instance_ref is None:
return None
+
+ # This ensures that all attributes of the instance
+ # are populated.
+ instance_ref = db.instance_get(ctxt, instance_ref['id'])
+
mpi = self._get_mpi_data(ctxt, instance_ref['project_id'])
if instance_ref['key_name']:
keys = {'0': {'_name': instance_ref['key_name'],