summaryrefslogtreecommitdiff
path: root/etc/neutron.conf
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-13 22:31:42 +0000
committerGerrit Code Review <review@openstack.org>2015-11-13 22:31:42 +0000
commitd8c07f193370f28d3c38b7119e5e238128ab7e80 (patch)
tree9cb1c2fcfeb6740303dbf182c8e1643b0dd10422 /etc/neutron.conf
parentb3bf5eede6c97f9d1f8fc845d36fa3cea9134211 (diff)
parent3101e2b62f0741baffc61174637486da17dd29bb (diff)
Merge "Move dhcp_lease_duration into DHCP agent config options list"
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 2745bd5..655ed2e 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