summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-25 16:38:51 +0000
committerGerrit Code Review <review@openstack.org>2012-06-25 16:38:51 +0000
commit259cf1cd39a46b36f47014d1b9770b52a563e9df (patch)
treeeb769132dd84bbf4a6772cbd3513795feb8e0b07
parent75546dade88d39469bb3479e80ebd6b4afad36e9 (diff)
parent35749ba5b8dee86b57f90da11c9566b3a6a24174 (diff)
downloadnova-259cf1cd39a46b36f47014d1b9770b52a563e9df.tar.gz
nova-259cf1cd39a46b36f47014d1b9770b52a563e9df.tar.xz
nova-259cf1cd39a46b36f47014d1b9770b52a563e9df.zip
Merge "XenAPI: Fixes Bug 1012878"
-rw-r--r--nova/virt/xenapi/vm_utils.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index bc2824559..64a479fe1 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -637,9 +637,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',