summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/flavors.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index a21ff6cb2..be295b372 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -42,7 +42,10 @@ class Controller(object):
def _get_flavors(self, req, is_detail=True):
"""Helper function that returns a list of flavor dicts."""
ctxt = req.environ['nova.context']
- flavors = db.api.instance_type_get_all(ctxt)
+ try:
+ flavors = db.api.instance_type_get_all(ctxt)
+ except exception.NoInstanceTypesFound:
+ flavors = {}
builder = self._get_view_builder(req)
items = [builder.build(flavor, is_detail=is_detail)
for flavor in flavors.values()]