From 35749ba5b8dee86b57f90da11c9566b3a6a24174 Mon Sep 17 00:00:00 2001 From: Renuka Apte Date: Wed, 13 Jun 2012 14:56:07 -0700 Subject: XenAPI: Fixes Bug 1012878 Launching an instance when the image is not cached fails since https://review.openstack.org/#/c/7971/, because the change tries to set the nova_disk_type key in _create_cached_image, but that is already set in create_vdi Change-Id: I5eeb1558acf894cc7cd2eea5fd0fb1cdd673b83c --- nova/virt/xenapi/vm_utils.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 7fecc03ff..bc46149fe 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -636,9 +636,6 @@ def _create_cached_image(context, session, instance, image_id, image_type): for vdi_type, vdi in fetched_vdis.iteritems(): vdi_ref = session.call_xenapi('VDI.get_by_uuid', vdi['uuid']) - session.call_xenapi('VDI.add_to_other_config', - vdi_ref, 'nova_disk_type', - vdi_type) vdi_rec = session.call_xenapi('VDI.get_record', vdi_ref) session.call_xenapi('VDI.add_to_other_config', -- cgit