diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-30 17:03:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-30 17:03:44 +0000 |
| commit | e372ec0b98269aeef99f73b98319b6876c33b7b1 (patch) | |
| tree | 8bb0dc14a360df8c2b9fe1f73003f5dbf3e2fb2b | |
| parent | 3146044b772b3c431e63fc898a86aabca2e52878 (diff) | |
| parent | 43fd6fe7385285ebd85972f96298bf1990b78e04 (diff) | |
| download | nova-e372ec0b98269aeef99f73b98319b6876c33b7b1.tar.gz nova-e372ec0b98269aeef99f73b98319b6876c33b7b1.tar.xz nova-e372ec0b98269aeef99f73b98319b6876c33b7b1.zip | |
Merge "Remove fetching of networks that weren't created via nova-manage"
| -rw-r--r-- | nova/network/quantum/manager.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index e9a059d4b..cbbde2aee 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -293,15 +293,6 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): net_proj_pairs = self.ipam.get_project_and_global_net_ids(context, project_id) - # Quantum may also know about networks that aren't in the networks - # table so we need to query Quanutm for any tenant networks and add - # them to net_proj_pairs. - qnets = self.q_conn.get_networks(project_id) - for qn in qnets['networks']: - pair = (qn['id'], project_id) - if pair not in net_proj_pairs: - net_proj_pairs.append(pair) - # Create a port via quantum and attach the vif for (quantum_net_id, project_id) in net_proj_pairs: # FIXME(danwent): We'd like to have the manager be |