summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-08 18:28:25 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-07-08 18:28:25 -0700
commit5ef4e6e318caa038f2af31a930f6b2b952176661 (patch)
treea51ad6c62aa88d58e489ee6238e8f8ba8e1be700 /nova/db
parent0af41b8c50631252f0dfe0b11268beb3d5e49508 (diff)
cleaned up on set network host to _setup_network and made networks allocate ips dynamically
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/api.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 472513329..c22ece068 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1706,7 +1706,9 @@ def network_get_all_by_host(context, host):
with session.begin():
return session.query(models.Network).\
filter_by(deleted=False).\
+ join(models.Network.fixed_ips).\
filter_by(host=host).\
+ filter_by(deleted=False).\
all()