From 1991fd682563474dab1f299a5c8842d2637fe887 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 12 Mar 2012 20:51:40 -0700 Subject: [PATCH] Map image ids to ec2 ids in metadata service * Fixes bug 953319 Change-Id: I96c1a7f260833adc40b0b07d38bccba4a233e091 --- nova/api/metadata/handler.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index acadab28f42..598dbf32cfe 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -202,21 +202,25 @@ def instance_type(self, address): 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)