From 911aca7d5a5554c60727410c793da0e24a9a743a Mon Sep 17 00:00:00 2001 From: Phil Day Date: Fri, 25 Jan 2013 18:20:26 +0000 Subject: Add system_metadata to db.instance_get_active_by_window_joined Without this compute/utils/notify_usage_exists() throws an exception when looking for system_metadata in the instance data Change-Id: I3606aa18b1aa69f98de820840c080f848af56157 --- nova/db/sqlalchemy/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index dff2e6b81..facf5410f 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1714,6 +1714,7 @@ def instance_get_active_by_window_joined(context, begin, end=None, options(joinedload('security_groups')).\ options(joinedload('metadata')).\ options(joinedload('instance_type')).\ + options(joinedload('system_metadata')).\ filter(or_(models.Instance.terminated_at == None, models.Instance.terminated_at > begin)) if end: -- cgit