diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-17 17:31:50 -0400 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-17 17:31:50 -0400 |
| commit | 79f2f90feec74b97d55af058c9bec4177bc47a54 (patch) | |
| tree | ba115cf88727d546d9c9e44f4ec91c00608cb1c2 /nova/api | |
| parent | e138e0836922ee0608feefbff5e4e5d03ad14197 (diff) | |
| parent | 5726430038ce01f6dc1efba6d1f51a84cadfecf9 (diff) | |
Merge from trunk.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 6f25d10bd..e3141934b 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -35,6 +35,7 @@ import nova.api.openstack.views.servers from nova.auth import manager as auth_manager from nova.compute import instance_types from nova.compute import power_state +from nova.quota import QuotaError import nova.api.openstack @@ -153,7 +154,7 @@ class Controller(wsgi.Controller): metadata=metadata, injected_files=injected_files) except QuotaError as error: - self._handle_quota_error(error) + self._handle_quota_errors(error) inst['instance_type'] = flavor_id inst['image_id'] = requested_image_id |