From: Tom Fifield <tom@openstack.org>
Date: Mon, 16 Jun 2014 09:15:42 +0000 (+0800)
Subject: Fix opt helpstring for dhcp_lease_duration
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0f9e82d6a68fa46bf11c3883e65975a2b40498e4;p=openstack-build%2Fneutron-build.git

Fix opt helpstring for dhcp_lease_duration

Recently (https://review.openstack.org/#/c/92453), the
functionality of dhcp_lease_duration was changed to support
infinite lease times.

However, this change failed to update the associated help text
with the option declaration. This patch simply updates the text
so that the new functionality can be understood by the user.

Change-Id: Id9dbe11599c55b447387df4a2d6639b7e8dba6ce
---

diff --git a/neutron/common/config.py b/neutron/common/config.py
index 19a388b0d..1340ef2ae 100644
--- a/neutron/common/config.py
+++ b/neutron/common/config.py
@@ -71,7 +71,8 @@ core_opts = [
                help=_("Maximum number of fixed ips per port")),
     cfg.IntOpt('dhcp_lease_duration', default=86400,
                deprecated_name='dhcp_lease_time',
-               help=_("DHCP lease duration")),
+               help=_("DHCP lease duration (in seconds). Use -1 to tell "
+                      "dnsmasq to use infinite lease times.")),
     cfg.BoolOpt('dhcp_agent_notification', default=True,
                 help=_("Allow sending resource operation"
                        " notification to DHCP agent")),