diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-20 22:33:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-20 22:33:56 +0000 |
| commit | 9c71217c97dbbd27224eac4301d1b6074c04f367 (patch) | |
| tree | be515bafc26ef5946cc2c7d6e6ac8f5ee696bf02 /nova/api | |
| parent | 4c6ecee63ea344507407027d0119201f257e2934 (diff) | |
| parent | 153c40ea1a026de17872c907ea543ea80bf5a074 (diff) | |
| download | nova-9c71217c97dbbd27224eac4301d1b6074c04f367.tar.gz nova-9c71217c97dbbd27224eac4301d1b6074c04f367.tar.xz nova-9c71217c97dbbd27224eac4301d1b6074c04f367.zip | |
Merge "Make flavorextradata ignore deleted flavors."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavorextradata.py | 2 |
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 |