diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-07 18:48:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-07 18:48:45 +0000 |
| commit | 9d5820effe83dda1192d57a29a6538d7a166facc (patch) | |
| tree | 7dd422a762866feb1e41d42b788285d68ad8f61a | |
| parent | 855aae0f9cfc81b86d175e2fde69d5d888fc2a1b (diff) | |
| parent | d854a1d4f3da949e364e3b80827cf25aff7c7344 (diff) | |
| download | nova-9d5820effe83dda1192d57a29a6538d7a166facc.tar.gz nova-9d5820effe83dda1192d57a29a6538d7a166facc.tar.xz nova-9d5820effe83dda1192d57a29a6538d7a166facc.zip | |
Merge "Fix multi_host column name in setup_networks..."
| -rw-r--r-- | nova/network/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 407255a40..60e642c81 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -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 |