diff options
| author | John Tran <jtran@attinteractive.com> | 2011-06-08 17:17:40 -0700 |
|---|---|---|
| committer | John Tran <jtran@attinteractive.com> | 2011-06-08 17:17:40 -0700 |
| commit | b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1 (patch) | |
| tree | 8eed5078b666f5805726ac11bd27b27ffb6b6b09 /nova/api | |
| parent | 3764be9d65483a9e431b69f37e3516fa20961362 (diff) | |
| download | nova-b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1.tar.gz nova-b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1.tar.xz nova-b11cf9bc7b1b9792bdab77aa72dc6163f3e44ca1.zip | |
removing custom exception, instead using NoFloatingIpsDefined
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 459ecb442..1915d007d 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -348,12 +348,6 @@ class Executor(wsgi.Application): LOG.debug(_('KeyPairExists raised: %s'), unicode(ex), context=context) return self._error(req, context, type(ex).__name__, unicode(ex)) - except rpc.RemoteError as ex: - LOG.debug(_('RemoteError raised: %s'), ex.exc_type, - context=context) - if ex.exc_type == 'NoMoreAddresses': - return self._error(req, context, 'AllocateAddressError', - ex.exc_type) except Exception as ex: extra = {'environment': req.environ} LOG.exception(_('Unexpected error raised: %s'), unicode(ex), |