diff options
| author | Rick Harris <rconradharris@gmail.com> | 2013-05-20 23:03:48 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2013-05-22 17:19:53 +0000 |
| commit | 3228cac0d1bc42681e82e90dc92b691af09f0fad (patch) | |
| tree | 418e000668fb0d2ea649280bb4e66b7529280db4 /nova/api | |
| parent | 1fa3101fceab27c8ac70c091bac0d9e7bcc184b4 (diff) | |
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
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 |
1 files changed, 0 insertions, 2 deletions
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: |