diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index 88188f5eeba..c9488f9f548 100644 --- a/quantum/agent/dhcp_agent.py +++ b/quantum/agent/dhcp_agent.py @@ -684,7 +684,7 @@ class DhcpAgentWithStateReport(DhcpAgent): 'configurations': { 'dhcp_driver': cfg.CONF.dhcp_driver, 'use_namespaces': cfg.CONF.use_namespaces, - 'dhcp_lease_time': cfg.CONF.dhcp_lease_time}, + 'dhcp_lease_duration': cfg.CONF.dhcp_lease_duration}, 'start_flag': True, 'agent_type': constants.AGENT_TYPE_DHCP} report_interval = cfg.CONF.AGENT.report_interval diff --git a/quantum/agent/linux/dhcp.py b/quantum/agent/linux/dhcp.py index b4e23dce219..54f620d7830 100644 --- a/quantum/agent/linux/dhcp.py +++ b/quantum/agent/linux/dhcp.py @@ -38,9 +38,6 @@ OPTS = [ cfg.StrOpt('dhcp_confs', default='$state_path/dhcp', help=_('Location to store DHCP server config files')), - cfg.IntOpt('dhcp_lease_time', - default=120, - help=_('Lifetime of a DHCP lease in seconds')), cfg.StrOpt('dhcp_domain', default='openstacklocal', help=_('Domain to use for building the hostnames')), @@ -303,7 +300,7 @@ class Dnsmasq(DhcpLocalProcess): (set_tag, self._TAG_PREFIX % i, netaddr.IPNetwork(subnet.cidr).network, mode, - self.conf.dhcp_lease_time)) + self.conf.dhcp_lease_duration)) cmd.append('--conf-file=%s' % self.conf.dnsmasq_config_file) if self.conf.dnsmasq_dns_server: diff --git a/quantum/common/config.py b/quantum/common/config.py index a2f0580755d..2d54873b5ef 100644 --- a/quantum/common/config.py +++ b/quantum/common/config.py @@ -71,6 +71,7 @@ core_opts = [ cfg.IntOpt('max_fixed_ips_per_port', default=5, help=_("Maximum number of fixed ips per port")), cfg.IntOpt('dhcp_lease_duration', default=120, + deprecated_name='dhcp_lease_time', help=_("DHCP lease duration")), cfg.BoolOpt('dhcp_agent_notification', default=True, help=_("Allow sending resource operation" diff --git a/quantum/tests/unit/test_linux_dhcp.py b/quantum/tests/unit/test_linux_dhcp.py index 5d745df347a..0590922805e 100644 --- a/quantum/tests/unit/test_linux_dhcp.py +++ b/quantum/tests/unit/test_linux_dhcp.py @@ -23,6 +23,7 @@ from oslo.config import cfg from quantum.agent.common import config from quantum.agent.linux import dhcp +from quantum.common import config as base_config from quantum.openstack.common import jsonutils from quantum.tests import base @@ -195,6 +196,7 @@ class TestBase(base.BaseTestCase): args = ['--config-file', os.path.join(root, 'etc', 'quantum.conf.test')] self.conf = config.setup_conf() + self.conf.register_opts(base_config.core_opts) self.conf.register_opts(dhcp.OPTS) self.conf.register_opt( cfg.StrOpt('dhcp_lease_relay_socket',