diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-13 21:12:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-13 21:12:31 +0000 |
| commit | dec0e49db2b031e09f7a73ce645a6000bc6ab932 (patch) | |
| tree | 23f54943d0a12fc1ad45499397446471721a6122 | |
| parent | 0e971ef9e990e48f81271d81c7e46b08f538abbd (diff) | |
| parent | 1991fd682563474dab1f299a5c8842d2637fe887 (diff) | |
| download | nova-dec0e49db2b031e09f7a73ce645a6000bc6ab932.tar.gz nova-dec0e49db2b031e09f7a73ce645a6000bc6ab932.tar.xz nova-dec0e49db2b031e09f7a73ce645a6000bc6ab932.zip | |
Merge "Map image ids to ec2 ids in metadata service"
| -rw-r--r-- | nova/api/metadata/handler.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index acadab28f..598dbf32c 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -202,21 +202,25 @@ class MetadataRequestHandler(wsgi.Application): def ami_id(self, address): instance_ref = self.get_instance(address) - return ec2utils.image_ec2_id(instance_ref['image_ref']) + image_id = instance_ref['image_ref'] + ctxt = context.get_admin_context() + return ec2utils.glance_id_to_ec2_id(ctxt, image_id) def kernel_id(self, address): instance_ref = self.get_instance(address) kernel_id = instance_ref.get('kernel_id') if kernel_id: - return ec2utils.image_ec2_id(kernel_id, - ec2utils.image_type('kernel')) + image_type = ec2utils.image_type('kernel') + ctxt = context.get_admin_context() + return ec2utils.glance_id_to_ec2_id(ctxt, kernel_id, image_type) def ramdisk_id(self, address): instance_ref = self.get_instance(address) ramdisk_id = instance_ref.get('ramdisk_id') if ramdisk_id: - return ec2utils.image_ec2_id(ramdisk_id, - ec2utils.image_type('ramdisk')) + image_type = ec2utils.image_type('ramdisk') + ctxt = context.get_admin_context() + return ec2utils.image_ec2_id(ctxt, ramdisk_id, image_type) def ami_launch_index(self, address): instance_ref = self.get_instance(address) |