From 5cb1c25993f72d83f297638ac52a70d69ae8b736 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Tue, 16 Jul 2013 16:06:32 -0700 Subject: [PATCH] Remove DHCP lease logic Previously neutron was keeping track of dhcp lease time in order to ensure it didn't hand out an ip address that was already leased. This patch removes that logic and instead leverages the dhcp_release utility. This allows us to reuse ip addresses immediately after a port is deleted. This patch also bumps the lease time to 24 hours instead of 2 minutes with reduces the amount of dhcp traffic. DocImpact There is a DocImpact for this bug related to the upgrade path. One should first upgrade their dhcp-agents. Then wait till the dhcp_lease time has expired. Lastly, update neutron-server in order to avoid the case where an instance is deleted and the dnsmasq process has not released the lease and neturon allocates that ip to a new port. Fixes bug: 1202392 Implements blueprint: remove-dhcp-lease Change-Id: Ifcb4f093c92904ceb896438987d53e692eb7fb26 --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index d30b962c5..4e3186286 100644 --- a/setup.cfg +++ b/setup.cfg @@ -73,7 +73,6 @@ console_scripts = neutron-db-manage = neutron.db.migration.cli:main neutron-debug = neutron.debug.shell:main neutron-dhcp-agent = neutron.agent.dhcp_agent:main - neutron-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main neutron-l3-agent = neutron.agent.l3_agent:main neutron-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main @@ -91,7 +90,6 @@ console_scripts = quantum-db-manage = neutron.db.migration.cli:main quantum-debug = neutron.debug.shell:main quantum-dhcp-agent = neutron.agent.dhcp_agent:main - quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main quantum-l3-agent = neutron.agent.l3_agent:main quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main