openstack/nova
Code Issues Proposed changes

Merge "Update db entry before upate the DHCP host file." into stable/folsom

Browse Source
This commit is contained in:
Jenkins 2012-11-27 14:02:15 +00:00 committed by Gerrit Code Review
commit 9d307f1663
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/network/manager.py
View File

@ -1321,6 +1321,10 @@ class NetworkManager(manager.SchedulerDependentManager):
self.instance_dns_manager.delete_entry(n, self.instance_dns_manager.delete_entry(n,
self.instance_dns_domain) self.instance_dns_domain)
self.db.fixed_ip_update(context, address,
{'allocated': False,
'virtual_interface_id': None})
if teardown: if teardown:
network = self._get_network_by_id(context, network = self._get_network_by_id(context,
fixed_ip_ref['network_id']) fixed_ip_ref['network_id'])
@ -1347,10 +1351,6 @@ class NetworkManager(manager.SchedulerDependentManager):
# callback will get called by nova-dhcpbridge. # callback will get called by nova-dhcpbridge.
self.driver.release_dhcp(dev, address, vif['address']) self.driver.release_dhcp(dev, address, vif['address'])
self.db.fixed_ip_update(context, address,
{'allocated': False,
'virtual_interface_id': None})
def lease_fixed_ip(self, context, address): def lease_fixed_ip(self, context, address):
"""Called by dhcp-bridge when ip is leased.""" """Called by dhcp-bridge when ip is leased."""
LOG.debug(_('Leased IP |%(address)s|'), locals(), context=context) LOG.debug(_('Leased IP |%(address)s|'), locals(), context=context)