diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-23 19:38:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-23 19:38:51 +0000 |
| commit | b9ead4d26b69ead8d101c2729bae28a51f864eed (patch) | |
| tree | b6856e6078f9f527bdbbbd00ffe3d73d2f7d9e00 | |
| parent | 1ae4f4eb21abe85600dc1137146cb8d85f1c03ea (diff) | |
| parent | fd280dac74a199e32819dd46efd04d8f3e9fd8ee (diff) | |
Merge "Fix quantum get_all_networks() signature (lp#936797)"
| -rw-r--r-- | nova/network/quantum/manager.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index ea6dae2c4..79f278401 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -94,7 +94,7 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): self.init_host_floating_ips() # Set up all the forwarding rules for any network that has a # gateway set. - networks = self.get_all_networks() + networks = self.get_all_networks(context.get_admin_context()) cidrs = [] for net in networks: if net['gateway']: @@ -114,11 +114,10 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): else: return FLAGS.node_availability_zone - def get_all_networks(self): + def get_all_networks(self, context): networks = [] - admin_context = context.get_admin_context() - networks.extend(self.ipam.get_global_networks(admin_context)) - networks.extend(self.ipam.get_project_networks(admin_context)) + networks.extend(self.ipam.get_global_networks(context)) + networks.extend(self.ipam.get_project_networks(context)) return networks def create_networks(self, context, label, cidr, multi_host, num_networks, |