summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-04-20 16:21:37 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-04-20 16:21:37 -0700
commit7d8698ad551b756a9dfc7058e6d836de65a64945 (patch)
tree9c765321f7b4a6ad13e15431dd22e19fbba3aa03 /nova/api
parentdb26ae5d02315f171704c209725ba511d76e3614 (diff)
in doesn't work properly on instance_ref
Diffstat (limited to 'nova/api')
-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