summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Besen <david.besen@hp.com>2012-07-18 16:27:27 -0600
committerDavid Besen <david.besen@hp.com>2012-07-18 16:29:10 -0600
commit153c40ea1a026de17872c907ea543ea80bf5a074 (patch)
tree82aaf274d01cab253f9cf131437d46890e3375a8
parent758356c512df7f23d112b6ffa6e921991bbae6f6 (diff)
Make flavorextradata ignore deleted flavors.
In _get_flavor_refs, don't retrieve inactive flavors. Fixes bug 1026210. Change-Id: I7c5d7848d2d1326d01770195e1c8a754bb673a7a
-rw-r--r--nova/api/openstack/compute/contrib/flavorextradata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/flavorextradata.py b/nova/api/openstack/compute/contrib/flavorextradata.py
index d50734817..5a6558ad0 100644
--- a/nova/api/openstack/compute/contrib/flavorextradata.py
+++ b/nova/api/openstack/compute/contrib/flavorextradata.py
@@ -38,7 +38,7 @@ class FlavorextradataController(wsgi.Controller):
def _get_flavor_refs(self):
"""Return a dictionary mapping flavorid to flavor_ref."""
- flavor_refs = instance_types.get_all_types(inactive=True)
+ flavor_refs = instance_types.get_all_types()
rval = {}
for name, obj in flavor_refs.iteritems():
rval[obj['flavorid']] = obj