From b9f1138be0c982edcfcfb289f64c356e00dd95d0 Mon Sep 17 00:00:00 2001
From: Jian Wen <wenjianhn@gmail.com>
Date: Mon, 3 Sep 2012 16:14:44 +0800
Subject: Fixes sqlalchemy.api.compute_node_get_by_host

Use join('service') instead of options(joinedload('service')) to get
the right compute_node

Fixes bug 1044238

Change-Id: I082a46847e63a1e21083a625c3b07ec9be05412f
---
 nova/db/sqlalchemy/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d9c157c21..106c8b8ed 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -593,7 +593,7 @@ def compute_node_get_by_host(context, host):
     session = get_session()
     with session.begin():
         node = session.query(models.ComputeNode).\
-                             options(joinedload('service')).\
+                             join('service').\
                              filter(models.Service.host == host).\
                              filter_by(deleted=False)
         return node.first()
-- 
cgit