Merge "Move the neutron_dhcp_config back to defaults"
This commit is contained in:
commit
8f81015e2d
@ -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: ""
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user