diff options
| author | Hengqing Hu <hudayou@hotmail.com> | 2012-01-10 23:08:13 +0800 |
|---|---|---|
| committer | Hengqing Hu <hudayou@hotmail.com> | 2012-01-10 23:08:13 +0800 |
| commit | 09fffd6928f5fa371ec66857eef394852b6c25e0 (patch) | |
| tree | 028a297fc1261a562f65a9b145769a183c3537f7 /nova | |
| parent | fa43949c05ff4e5165baa2f0a0f1555e94bcf212 (diff) | |
| download | nova-09fffd6928f5fa371ec66857eef394852b6c25e0.tar.gz nova-09fffd6928f5fa371ec66857eef394852b6c25e0.tar.xz nova-09fffd6928f5fa371ec66857eef394852b6c25e0.zip | |
Fix metadata mapping in s3._s3_parse_manifest.
Fixes bug #827617
Fixes incorrect output of the following euca2ools commands:
'euca-describe-images'
'euca-describe-instances'
Which occours when user published 'ami' image with 'ari&aki' or 'aki'
image(s).
Fixes minor typo:
'manifext' -> 'manifest'
Change-Id: If32357e3ea6685476df9dbb6e74af710153457b9
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/image/s3.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/image/s3.py b/nova/image/s3.py index 46a940a69..fe320a406 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -216,7 +216,7 @@ class S3ImageService(object): def _translate_dependent_image_id(image_key, image_id): image_id = ec2utils.ec2_id_to_id(image_id) image_uuid = self.get_image_uuid(context, image_id) - properties['image_id'] = image_uuid + properties[image_key] = image_uuid if kernel_id: _translate_dependent_image_id('kernel_id', kernel_id) @@ -248,7 +248,7 @@ class S3ImageService(object): return manifest, image, image_uuid def _s3_create(self, context, metadata): - """Gets a manifext from s3 and makes an image.""" + """Gets a manifest from s3 and makes an image.""" image_path = tempfile.mkdtemp(dir=FLAGS.image_decryption_dir) |