From 3228cac0d1bc42681e82e90dc92b691af09f0fad Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Mon, 20 May 2013 23:03:48 +0000 Subject: Remove ImageTooLarge exception InstanceTypeDiskTooSmall and ImageTooLarge are really two sides of the same coin; an image is larger than the root_gb of the instance_type. Rather than have two exceptions for this, this patch consolidates down to just InstanceTypeDiskTooSmall. Change-Id: I401205072c111a960beb2932c6c1889141ae03c3 --- nova/api/openstack/compute/servers.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 512f8cb7a..7bb7817d6 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -922,7 +922,6 @@ class Controller(wsgi.Controller): msg = "UnicodeError: %s" % unicode(error) raise exc.HTTPBadRequest(explanation=msg) except (exception.ImageNotActive, - exception.ImageTooLarge, exception.InstanceTypeDiskTooSmall, exception.InstanceTypeMemoryTooSmall, exception.InstanceTypeNotFound, @@ -1283,7 +1282,6 @@ class Controller(wsgi.Controller): msg = _("Cannot find image for rebuild") raise exc.HTTPBadRequest(explanation=msg) except (exception.ImageNotActive, - exception.ImageTooLarge, exception.InstanceTypeDiskTooSmall, exception.InstanceTypeMemoryTooSmall, exception.InvalidMetadata) as error: -- cgit