openstack/nova
Code Issues Proposed changes

Merge "Fix multi_host column name in setup_networks..."

Browse Source
This commit is contained in:
Jenkins
2012-03-07 18:48:45 +00:00
committed by Gerrit Code Review
parent 855aae0f9c d854a1d4f3
commit 9d5820effe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/network/manager.py
View File

@@ -1465,8 +1465,8 @@ class NetworkManager(manager.SchedulerDependentManager):
fixed_ips = self.db.fixed_ips_by_virtual_interface(context,
vif['id'])
addresses = [fixed_ip['address'] for fixed_ip in fixed_ips]
if not network['multihost']:
#NOTE (tr3buchet): if using multihost, host is instance[host]
if not network['multi_host']:
#NOTE (tr3buchet): if using multi_host, host is instance[host]
host = network['host']
if self.host == host or host is None:
# at this point i am the correct host, or host doesn't