From 31506c0a252f06e283eecc54741f6a3062fbe913 Mon Sep 17 00:00:00 2001 From: Josh Kearney Date: Wed, 23 May 2012 13:36:37 -0500 Subject: Permit deleted instance types to be queried for active instances. Fixes bug 994935. This removes the deleted=0 restriction for joining instance_types to instances. Active instances may be using old/deleted instance_types, so we still need to be able to look up that information for show/detail requests. Change-Id: Ica72801f19c7e5b04966e53ed3ea4c330df44ed1 --- nova/db/sqlalchemy/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nova/db') diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index c07f2c9de..78fcaa7e5 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -319,8 +319,7 @@ class InstanceTypes(BASE, NovaBase): foreign_keys=id, primaryjoin='and_(' 'Instance.instance_type_id == ' - 'InstanceTypes.id, ' - 'InstanceTypes.deleted == False)') + 'InstanceTypes.id)') class Volume(BASE, NovaBase): -- cgit