Merge "Move dhcp_lease_duration into DHCP agent config options list"
This commit is contained in:
commit
d8c07f1933
@ -95,6 +95,9 @@
|
||||
# If the timeout expires, ovs commands will fail with ALARMCLOCK error.
|
||||
# ovs_vsctl_timeout = 10
|
||||
|
||||
# DHCP lease duration (in seconds). Use -1 for infinite lease times.
|
||||
# dhcp_lease_duration = 86400
|
||||
|
||||
[AGENT]
|
||||
# Log agent heartbeats from this DHCP agent
|
||||
# log_agent_heartbeats = False
|
||||
|
@ -110,10 +110,6 @@
|
||||
# Maximum amount of retries to generate a unique MAC address
|
||||
# mac_generation_retries = 16
|
||||
|
||||
# DHCP Lease duration (in seconds). Use -1 to
|
||||
# tell dnsmasq to use infinite lease times.
|
||||
# dhcp_lease_duration = 86400
|
||||
|
||||
# Domain to use for building the hostnames
|
||||
# dns_domain = openstacklocal
|
||||
|
||||
|
@ -45,6 +45,10 @@ DHCP_OPTS = [
|
||||
'neutron.conf as dns_domain. It will removed from here '
|
||||
'in a future release'),
|
||||
deprecated_for_removal=True),
|
||||
cfg.IntOpt('dhcp_lease_duration', default=86400,
|
||||
deprecated_name='dhcp_lease_time',
|
||||
help=_('DHCP lease duration (in seconds). Use -1 for infinite '
|
||||
'lease times.')),
|
||||
]
|
||||
|
||||
DNSMASQ_OPTS = [
|
||||
|
@ -83,10 +83,6 @@ core_opts = [
|
||||
cfg.BoolOpt('ipv6_pd_enabled', default=False,
|
||||
help=_("Enables IPv6 Prefix Delegation for automatic subnet "
|
||||
"CIDR allocation")),
|
||||
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',
|
||||
default='openstacklocal',
|
||||
help=_('Domain to use for building the hostnames')),
|
||||
|
Loading…
x
Reference in New Issue
Block a user