diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-12 01:26:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-12 01:26:49 +0000 |
| commit | 5a3901a97669453122092c49a2355fea08d7b3a4 (patch) | |
| tree | b0a3406890a75b3264aae0e79d975cbba204ae33 | |
| parent | 22d10296c0371dc0f5990d335e3239d80978a773 (diff) | |
| parent | 09fffd6928f5fa371ec66857eef394852b6c25e0 (diff) | |
| download | nova-5a3901a97669453122092c49a2355fea08d7b3a4.tar.gz nova-5a3901a97669453122092c49a2355fea08d7b3a4.tar.xz nova-5a3901a97669453122092c49a2355fea08d7b3a4.zip | |
Merge "Fix metadata mapping in s3._s3_parse_manifest."
| -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) |