From 6b32033370576680c3682c187e1c6c1b18737821 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 1 Aug 2016 02:08:01 -0700 Subject: [PATCH] DHCP: remove deprecated config dhcp_lease_time This was marked as deprecated in commit 95dbd03a0bc4867bf8520539ed08f4068adf2f33. That was in Havana. We have given enough time for admins to upgrade to the new variable - dhcp_lease_duration. UpgradeImpact TrivialFix Change-Id: Ie08c8f66b84cc577a99355f6977f946398b0a94a --- neutron/conf/common.py | 1 - releasenotes/notes/dhcp-lease-time-5c504c3730a4f9ea.yaml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/dhcp-lease-time-5c504c3730a4f9ea.yaml diff --git a/neutron/conf/common.py b/neutron/conf/common.py index e2b2b99aa93..ad151204549 100644 --- a/neutron/conf/common.py +++ b/neutron/conf/common.py @@ -96,7 +96,6 @@ core_opts = [ "Note that enabling PD will override the behavior of " "the default IPv6 subnetpool.")), 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', diff --git a/releasenotes/notes/dhcp-lease-time-5c504c3730a4f9ea.yaml b/releasenotes/notes/dhcp-lease-time-5c504c3730a4f9ea.yaml new file mode 100644 index 00000000000..0ed4c98fa81 --- /dev/null +++ b/releasenotes/notes/dhcp-lease-time-5c504c3730a4f9ea.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - The configuration option dhcp_lease_time was + deprecated in the Havana cycle. This option is no longer + supported. The option was replaced by dhcp_lease_duration.