Merge "Move the neutron_dhcp_config back to defaults"

This commit is contained in:
Zuul 2017-10-29 01:16:47 +00:00 committed by Gerrit Code Review
commit 8f81015e2d
2 changed files with 4 additions and 2 deletions

View File

@ -312,6 +312,10 @@ neutron_l3_ha_net_cidr: 169.254.192.0/18
### DHCP Agent Plugin Configuration
###
# key=value options provided to dnsmasq
neutron_dhcp_config:
log-facility: "/var/log/neutron/neutron-dnsmasq.log"
# Comma-separated list of DNS servers which will be used by dnsmasq as forwarders.
neutron_dnsmasq_dns_servers: ""

View File

@ -261,8 +261,6 @@ neutron_l3: "{% if 'router' in neutron_plugin_base or 'neutron.services.l3_route
###
neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}"
neutron_dhcp_config:
log-facility: "/var/log/neutron/neutron-dnsmasq.log"
###
### Metadata Agent Plugin Configuration