diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-07-12 21:50:12 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-07-12 21:50:12 -0400 |
| commit | 7acb3d63cd2c487c78994e15f1e015d3b81febf8 (patch) | |
| tree | 3fa294c8179a25543289ad0c4bd8d47e3d413407 /nova | |
| parent | 952196a533c3577945a2c4245436d09eb75e0eb6 (diff) | |
Don't pop 'vpn' on kwargs inside a loop in RPCAllocateFixedIP._allocate_fixed_ips (fixes KeyError's).
Fix allocate_fixed_ip method signature for FlatDHCP.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/manager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 383fbd32f..007766998 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -128,6 +128,7 @@ class RPCAllocateFixedIP(object): """Calls allocate_fixed_ip once for each network.""" green_pool = greenpool.GreenPool() + vpn = kwargs.pop('vpn') for network in networks: if network['host'] != self.host: # need to call allocate_fixed_ip to correct network host @@ -136,15 +137,14 @@ class RPCAllocateFixedIP(object): args = {} args['instance_id'] = instance_id args['network_id'] = network['id'] - args['vpn'] = kwargs.pop('vpn') + args['vpn'] = vpn green_pool.spawn_n(rpc.call, context, topic, {'method': '_rpc_allocate_fixed_ip', 'args': args}) else: # i am the correct host, run here - self.allocate_fixed_ip(context, instance_id, network, - vpn=kwargs.pop('vpn')) + self.allocate_fixed_ip(context, instance_id, network, vpn=vpn) # wait for all of the allocates (if any) to finish green_pool.waitall() @@ -753,7 +753,7 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager): self.driver.ensure_bridge(network['bridge'], network['bridge_interface']) - def allocate_fixed_ip(self, context, instance_id, network): + def allocate_fixed_ip(self, context, instance_id, network, **kwargs): """Allocate flat_network fixed_ip, then setup dhcp for this network.""" address = super(FlatDHCPManager, self).allocate_fixed_ip(context, instance_id, |