summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-03-17 23:34:58 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-03-17 23:34:58 -0400
commit0c7d93402885ea6644a5fb3c4e65115b2e5626be (patch)
treed246237e196a7cadb38c4f68dbc605475828a825 /nova/api
parentfebbfd45a0c1dbd16093ab38897e94ddb331e9ea (diff)
parent79f2f90feec74b97d55af058c9bec4177bc47a54 (diff)
Merged dependant branch lp:~rackspace-titan/nova/openstack-api-versioned-controllers
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
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