diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-22 17:23:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-22 17:23:09 +0000 |
| commit | 0d8d69caadab60ae6da23976e60b477fe4602b77 (patch) | |
| tree | 70806dd65196eb442c35524e0c16d7e85e9c7d76 /nova/api | |
| parent | 3d9a122a658a45035a20a9cdb73fa334319be94f (diff) | |
| parent | 9d328628dea9530de629f829faa569fd87e0ac90 (diff) | |
| download | nova-0d8d69caadab60ae6da23976e60b477fe4602b77.tar.gz nova-0d8d69caadab60ae6da23976e60b477fe4602b77.tar.xz nova-0d8d69caadab60ae6da23976e60b477fe4602b77.zip | |
Merge "Handle correctly QuotaError in EC2 API"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index cfa7e91be..17759015f 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -629,6 +629,10 @@ class Executor(wsgi.Application): LOG.debug(_('InvalidRequest raised: %s'), unicode(ex), context=context) return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) + except exception.QuotaError as ex: + LOG.debug(_('QuotaError raised: %s'), unicode(ex), + context=context) + return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except exception.InvalidInstanceIDMalformed as ex: LOG.debug(_('ValidatorError raised: %s'), unicode(ex), context=context) |