diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 23:20:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 23:20:38 +0000 |
| commit | e13b19ab3e7857fdd4c5a185df81879f97b7dd4d (patch) | |
| tree | 700ff84381f24e49e3f83ebdd9bf385f3866b443 /nova/api | |
| parent | 3390c70d2f4481527aaf2fbc3847664b3f45de0e (diff) | |
| parent | d741328543ad6059bef56adb59f4c94781eaedcd (diff) | |
Merge "Fix flavor deletion when there is a deleted flavor"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/flavormanage.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index a7e313c9c..69d5d6ed9 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -42,7 +42,8 @@ class FlavorManageController(wsgi.Controller): authorize(context) try: - flavor = instance_types.get_instance_type_by_flavor_id(id) + flavor = instance_types.get_instance_type_by_flavor_id( + id, read_deleted="no") except exception.NotFound, e: raise webob.exc.HTTPNotFound(explanation=str(e)) |