diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 19:22:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 19:22:30 +0000 |
| commit | 90faa27050be670bc45aee7b6ee5da0cc0cfcbf2 (patch) | |
| tree | ac567709aa5a1c839598e5ef0a1d7048ec0b40d6 /nova | |
| parent | 30a9ae2f923cf89f6b0acaa30d441170d1d5539c (diff) | |
| parent | 55c7ac12c0aa11e328243f79931b3d9721816389 (diff) | |
| download | nova-90faa27050be670bc45aee7b6ee5da0cc0cfcbf2.tar.gz nova-90faa27050be670bc45aee7b6ee5da0cc0cfcbf2.tar.xz nova-90faa27050be670bc45aee7b6ee5da0cc0cfcbf2.zip | |
Merge "Handle kwargs in deallocate_fixed_ip for FlatDHCP."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 60e642c81..8e653d504 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -229,7 +229,7 @@ class RPCAllocateFixedIP(object): network = self._get_network_by_id(context, network_id) return self.allocate_fixed_ip(context, instance_id, network, **kwargs) - def deallocate_fixed_ip(self, context, address, host): + def deallocate_fixed_ip(self, context, address, host, **kwargs): """Call the superclass deallocate_fixed_ip if i'm the correct host otherwise cast to the correct host""" fixed_ip = self.db.fixed_ip_get_by_address(context, address) |