diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-23 16:44:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-23 16:44:34 +0000 |
| commit | 3bbf3b055818ee5ad2d36239288115bb803ac5e8 (patch) | |
| tree | 614bc01d1130daeef5d9010f9a49b694767db579 /nova/virt | |
| parent | 4f9a143712bb0df7227be4c66b0982a3c42e4408 (diff) | |
| parent | 3228cac0d1bc42681e82e90dc92b691af09f0fad (diff) | |
Merge "Remove ImageTooLarge exception"
Diffstat (limited to 'nova/virt')
| -rwxr-xr-x | nova/virt/libvirt/imagebackend.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 84686a82a..575ae262e 100755 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -258,7 +258,7 @@ class Qcow2(Image): if size and size < disk.get_disk_size(base): LOG.error('%s virtual size larger than flavor root disk size %s' % (base, size)) - raise exception.ImageTooLarge() + raise exception.InstanceTypeDiskTooSmall() if not os.path.exists(self.path): with utils.remove_path_on_error(self.path): copy_qcow2_image(base, self.path, size) diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 3f2c6835f..69a944b9b 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1207,7 +1207,7 @@ def _check_vdi_size(context, session, instance, vdi_uuid): LOG.info(_("Image size %(size_bytes)d exceeded instance_type " "allowed size %(allowed_size_bytes)d"), locals(), instance=instance) - raise exception.ImageTooLarge() + raise exception.InstanceTypeDiskTooSmall() def _fetch_disk_image(context, session, instance, name_label, image_id, |