summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihrachys@redhat.com>2015-11-13 12:17:43 +0100
committerIhar Hrachyshka <ihrachys@redhat.com>2015-11-13 12:21:44 +0100
commit3101e2b62f0741baffc61174637486da17dd29bb (patch)
treece89e601aa0b7562ff123d04e299f73944f3cf46 /etc/neutron.conf
parent8ee67e477c70ad0a15c415217e8b0f69e9ecaaac (diff)
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
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: garyk <gkotton@vmware.com> Verified+1: Microsoft Hyper-V CI <hyper-v_ci@microsoft.com> Code-Review+1: Henry Gessau <gessau@cisco.com> Code-Review+2: Cedric Brandily <zzelle@gmail.com> Workflow+1: Cedric Brandily <zzelle@gmail.com> Verified+1: Ryu CI <ryu-openstack-review@lists.sourceforge.net> Code-Review+1: Ryan Moats <rmoats@us.ibm.com> Code-Review+1: Sergey Belous <sbelous@mirantis.com> Submitted-by: Jenkins Submitted-at: Fri, 13 Nov 2015 22:31:42 +0000 Reviewed-on: https://review.openstack.org/245097 Project: openstack/neutron Branch: refs/heads/master
Diffstat (limited to 'etc/neutron.conf')
-rw-r--r--etc/neutron.conf4
1 files changed, 0 insertions, 4 deletions
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 3140c2c..763786b 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -110,10 +110,6 @@
110# Maximum amount of retries to generate a unique MAC address 110# Maximum amount of retries to generate a unique MAC address
111# mac_generation_retries = 16 111# mac_generation_retries = 16
112 112
113# DHCP Lease duration (in seconds). Use -1 to
114# tell dnsmasq to use infinite lease times.
115# dhcp_lease_duration = 86400
116
117# Domain to use for building the hostnames 113# Domain to use for building the hostnames
118# dns_domain = openstacklocal 114# dns_domain = openstacklocal
119 115