From 3101e2b62f0741baffc61174637486da17dd29bb Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 13 Nov 2015 12:17:43 +0100 Subject: [PATCH] Move dhcp_lease_duration into DHCP agent config options list It is DHCP agent specific, and so it should not be present in neutron.conf or be reported as a valid option for other services. Also modified the help message slightly to avoid mentioning dnsmasq since the option could in theory be used by alternative dhcp drivers. Change-Id: I66bcea1c3a6ce6fa9ce56ea8137a94858f18dc5a --- etc/dhcp_agent.ini | 3 +++ etc/neutron.conf | 4 ---- neutron/agent/dhcp/config.py | 4 ++++ neutron/common/config.py | 4 ---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini index a7e5547ba31..21e12488fa8 100644 --- a/etc/dhcp_agent.ini +++ b/etc/dhcp_agent.ini @@ -95,6 +95,9 @@ # If the timeout expires, ovs commands will fail with ALARMCLOCK error. # ovs_vsctl_timeout = 10 +# DHCP lease duration (in seconds). Use -1 for infinite lease times. +# dhcp_lease_duration = 86400 + [AGENT] # Log agent heartbeats from this DHCP agent # log_agent_heartbeats = False diff --git a/etc/neutron.conf b/etc/neutron.conf index 3140c2c352e..763786b8192 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -110,10 +110,6 @@ # Maximum amount of retries to generate a unique MAC address # mac_generation_retries = 16 -# DHCP Lease duration (in seconds). Use -1 to -# tell dnsmasq to use infinite lease times. -# dhcp_lease_duration = 86400 - # Domain to use for building the hostnames # dns_domain = openstacklocal diff --git a/neutron/agent/dhcp/config.py b/neutron/agent/dhcp/config.py index a6c00b9e17f..837b7467ae5 100644 --- a/neutron/agent/dhcp/config.py +++ b/neutron/agent/dhcp/config.py @@ -45,6 +45,10 @@ DHCP_OPTS = [ 'neutron.conf as dns_domain. It will removed from here ' 'in a future release'), deprecated_for_removal=True), + cfg.IntOpt('dhcp_lease_duration', default=86400, + deprecated_name='dhcp_lease_time', + help=_('DHCP lease duration (in seconds). Use -1 for infinite ' + 'lease times.')), ] DNSMASQ_OPTS = [ diff --git a/neutron/common/config.py b/neutron/common/config.py index 1f07ba00a0d..38ae94f384e 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -81,10 +81,6 @@ core_opts = [ cfg.BoolOpt('ipv6_pd_enabled', default=False, help=_("Enables IPv6 Prefix Delegation for automatic subnet " "CIDR allocation")), - cfg.IntOpt('dhcp_lease_duration', default=86400, - deprecated_name='dhcp_lease_time', - help=_("DHCP lease duration (in seconds). Use -1 to tell " - "dnsmasq to use infinite lease times.")), cfg.StrOpt('dns_domain', default='openstacklocal', help=_('Domain to use for building the hostnames')),