Use proper dnsmasq config file when dnsmasq-flags are set
Instead of using that file only when instance-mtu is defined, it should also be used when dnsmasq-flags are defined. Change-Id: Ib753d428a65025f79613798e58c987942dcd1495 Closes-Bug: #1642501
This commit is contained in:
parent
52994e3782
commit
0bd0e84823
@ -8,7 +8,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
|
|||||||
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
|
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
|
||||||
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
||||||
|
|
||||||
{% if instance_mtu -%}
|
{% if instance_mtu or dnsmasq_flags -%}
|
||||||
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
|
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
{% if plugin == 'nvp' or plugin == 'nsx' -%}
|
{% if plugin == 'nvp' or plugin == 'nsx' -%}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user