openstack/charm-neutron-gateway
Code Issues Proposed changes

Use proper dnsmasq config file when dnsmasq-flags are set

Browse Source 
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:
Ante Karamatic 2016-11-17 09:28:18 +01:00
parent 52994e3782
commit 0bd0e84823
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/dhcp_agent.ini
View File

@ -8,7 +8,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
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
{% endif -%}
{% if plugin == 'nvp' or plugin == 'nsx' -%}