summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-18 17:35:14 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-07-18 17:35:14 -0700
commit39701e13188275fc2f798a790e2edc4488ecb3e4 (patch)
tree9e6fe1ec22096d1c5540f385f1d9ecd148d60dc4
parent89ead61d521c8f585732d50b8d3d31361d7c1d82 (diff)
missed the vpn kwarg in rpc
-rw-r--r--nova/network/manager.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 360e08ceb..7a7520f5d 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -156,12 +156,13 @@ class RPCAllocateFixedIP(object):
# wait for all of the allocates (if any) to finish
green_pool.waitall()
- def _rpc_allocate_fixed_ip(self, context, instance_id, network_id):
+ def _rpc_allocate_fixed_ip(self, context, instance_id, network_id,
+ **kwargs):
"""Sits in between _allocate_fixed_ips and allocate_fixed_ip to
perform network lookup on the far side of rpc.
"""
network = self.db.network_get(context, network_id)
- self.allocate_fixed_ip(context, instance_id, network)
+ self.allocate_fixed_ip(context, instance_id, network, **kwargs)
class FloatingIP(object):