diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-03 18:51:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-03 18:51:28 +0000 |
| commit | fd7d07536bef5ed0412ecb42ab164b1808628b83 (patch) | |
| tree | 0e7bedab273467d4a4cee8332eac1232c8bfe668 | |
| parent | 75d6a844a23aba3316e426793ee09ae8870f3b83 (diff) | |
| parent | 8f5039615826539dca4e5532185d6c03e386dd87 (diff) | |
| download | nova-fd7d07536bef5ed0412ecb42ab164b1808628b83.tar.gz nova-fd7d07536bef5ed0412ecb42ab164b1808628b83.tar.xz nova-fd7d07536bef5ed0412ecb42ab164b1808628b83.zip | |
Merge "Delete swap VDI if not used"
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index c7f713ea2..139eb3262 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -418,10 +418,14 @@ class VMOps(object): # Attach any other disks for vdi in vdis[1:]: - if generate_swap and vdi['vdi_type'] == 'swap': - continue vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi['vdi_uuid']) + + if generate_swap and vdi['vdi_type'] == 'swap': + # We won't be using it, so don't let it leak + VMHelper.destroy_vdi(self._session, vdi_ref) + continue + VolumeHelper.create_vbd(session=self._session, vm_ref=vm_ref, vdi_ref=vdi_ref, userdevice=userdevice, bootable=False) |