summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorKevin Benton <kevinbenton@buttewifi.com>2015-11-16 10:53:24 +0000
committerKevin Benton <kevinbenton@buttewifi.com>2015-11-16 10:53:24 +0000
commit3a57401e86b1646a98163a975977477b35e2fb9b (patch)
treee5f00a48ae04d09e8d6fea0d8178150019c14ec5 /etc/neutron.conf
parent3101e2b62f0741baffc61174637486da17dd29bb (diff)
Revert "Move dhcp_lease_duration into DHCP agent config options list"
This reverts commit 3101e2b62f0741baffc61174637486da17dd29bb. The lease duration isn't DHCP agent specific. DHCP is a feature that should be provided by whatever plugin is loaded and operators would still like to set lease times for DHCP. In the reference implementation we just consume it directly in the agent, but that doesn't mean it's specific to the agent implementation. Change-Id: I5efb6aa5e196d4cac5ff7c0c35be5a350401b925
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+2: YAMAMOTO Takashi <yamamoto@midokura.com> Verified+1: Ryu CI <ryu-openstack-review@lists.sourceforge.net> Verified+1: Mellanox CI <mlnx-openstack-ci@dev.mellanox.co.il> Code-Review+2: Doug Wiegley <dougwig@parkside.io> Workflow+1: Doug Wiegley <dougwig@parkside.io> Code-Review-1: Dariusz Smigiel <dariusz.smigiel@intel.com> Submitted-by: Jenkins Submitted-at: Tue, 17 Nov 2015 05:29:34 +0000 Reviewed-on: https://review.openstack.org/245705 Project: openstack/neutron Branch: refs/heads/master
Diffstat (limited to 'etc/neutron.conf')
-rw-r--r--etc/neutron.conf4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/neutron.conf b/etc/neutron.conf
index 763786b..3140c2c 100644
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -110,6 +110,10 @@
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
113# Domain to use for building the hostnames 117# Domain to use for building the hostnames
114# dns_domain = openstacklocal 118# dns_domain = openstacklocal
115 119