summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-07-27 16:26:24 -0500
committerKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-07-27 16:26:50 -0500
commit3f315000755732c4780dae03ef65f67d3f87e8f7 (patch)
treea80ad5843ba61a82e6c85197cf45b8429890a72c /nova/openstack
parent8a139e6750adeec3597d6aa1ae82354d7fc8f38d (diff)
downloadnova-3f315000755732c4780dae03ef65f67d3f87e8f7.tar.gz
nova-3f315000755732c4780dae03ef65f67d3f87e8f7.tar.xz
nova-3f315000755732c4780dae03ef65f67d3f87e8f7.zip
Allow _destroy_vdis if a mapping has no VDI
In _destroy_vdis() in the xenapi vmops.py, a list of VDIs to not destroy is collected. If one of the block device mappings does not have a corresponding VDI, however, _destroy_vdis() fails (KeyError('vdi_uuid') is raised). This interferes with instance deletion. The problem is corrected by skipping mappings for which the connection_info data does not contain 'vdi_uuid'. Fixes bug 1030143. Change-Id: I5125d557ab799fcf572f665523cd07a893ad3b90
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions