summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-04-21 02:26:09 +0000
committerTarmac <>2011-04-21 02:26:09 +0000
commitb22705208133e5ff848b41296c2eec7a7b4e15e6 (patch)
tree89078f9695d11454404fcbb1ba6afe1ba5029d48 /nova
parent7e345f07edc13ad7d56d50b67b089b16d860cb40 (diff)
parent7d8698ad551b756a9dfc7058e6d836de65a64945 (diff)
Makes metadata correctly display kernel-id and ramdisk-id.
References from the Database don't support "in".
Diffstat (limited to 'nova')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index bd4c9dcd4..4785d812a 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -187,7 +187,7 @@ class CloudController(object):
'mpi': mpi}}
for image_type in ['kernel', 'ramdisk']:
- if '%s_id' % image_type in instance_ref:
+ if instance_ref.get('%s_id' % image_type):
ec2_id = self._image_ec2_id(instance_ref['%s_id' % image_type],
self._image_type(image_type))
data['meta-data']['%s-id' % image_type] = ec2_id