=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-07-12 15:47:26 +0000
+++ nova/network/manager.py	2011-07-13 01:45:37 +0000
@@ -128,6 +128,7 @@
         """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 @@
                 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()
@@ -696,7 +696,7 @@
 
     timeout_fixed_ips = False
 
-    def _allocate_fixed_ips(self, context, instance_id, networks):
+    def _allocate_fixed_ips(self, context, instance_id, networks, **kwargs):
         """Calls allocate_fixed_ip once for each network."""
         for network in networks:
             self.allocate_fixed_ip(context, instance_id, network)
@@ -753,7 +753,7 @@
             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,