diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-03 14:47:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-03 14:47:55 +0000 |
| commit | b5e8dcd3666fe869cf67a6a3c168120d68dab8a4 (patch) | |
| tree | 31caff521fafa934fbb86f3bbb151005479846d1 /nova | |
| parent | 5d94144708ba30d35decec2d006c837545579d0e (diff) | |
| parent | b9f1138be0c982edcfcfb289f64c356e00dd95d0 (diff) | |
| download | nova-b5e8dcd3666fe869cf67a6a3c168120d68dab8a4.tar.gz nova-b5e8dcd3666fe869cf67a6a3c168120d68dab8a4.tar.xz nova-b5e8dcd3666fe869cf67a6a3c168120d68dab8a4.zip | |
Merge "Fixes sqlalchemy.api.compute_node_get_by_host"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
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() |