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

nova/image/s3.py

@@ -216,7 +216,7 @@ def _s3_parse_manifest(self, context, metadata, manifest):
         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 @@ def _translate_dependent_image_id(image_key, image_id):
         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)