diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-23 20:40:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-23 20:40:46 +0000 |
| commit | c7378032c8bbdc77efb98f427b73df096dd82085 (patch) | |
| tree | 8556df7950b6093406208b3a5d04eb6c49a81fb1 /nova/compute | |
| parent | 1a2d94f39e4119263b31d3ede2beb90c658dc19a (diff) | |
| parent | 31506c0a252f06e283eecc54741f6a3062fbe913 (diff) | |
Merge "Permit deleted instance types to be queried for active instances."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/instance_types.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py index c4a6f66f9..f0514cb73 100644 --- a/nova/compute/instance_types.py +++ b/nova/compute/instance_types.py @@ -144,5 +144,7 @@ def get_instance_type_by_flavor_id(flavorid): :raises: FlavorNotFound """ - ctxt = context.get_admin_context() + # NOTE(jk0): Reading deleted is OK here because we're an admin and querying + # flavors directly. + ctxt = context.get_admin_context(read_deleted="yes") return db.instance_type_get_by_flavor_id(ctxt, flavorid) |