summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-13 02:42:37 +0900
committerMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-13 02:42:37 +0900
commit7b4f593efa834ed87d4b5ed75bd06a2a7257e51f (patch)
tree5e57fcfc180c47507e74a13ef39fe08c8513c266 /nova/api
parenta4791a2d2b4f44c636b7f7694e92bed615309070 (diff)
parentaebcd4abd574b2edb8f2919cb4c2a77617eb97e9 (diff)
Rebased to trunk rev 980.
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'],