From e17d73c416d92a014104c73ae4167cb0c997ad3b Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Thu, 16 Jul 2020 16:49:34 +0200 Subject: [PATCH] Honour the `instance-mtu` configuration option The templates was missing a gate on the `instance_mtu` context variable. Update template for all supported versions to be on par with the neutrona-gateway charm. Change-Id: I2468ce5e20150371a7472ecdd89f8d4b3b14c489 Closes-Bug: #1887817 --- templates/icehouse/dhcp_agent.ini | 2 +- templates/mitaka/dhcp_agent.ini | 2 +- templates/ocata/dhcp_agent.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/icehouse/dhcp_agent.ini b/templates/icehouse/dhcp_agent.ini index fea5d285..b82e6bc1 100644 --- a/templates/icehouse/dhcp_agent.ini +++ b/templates/icehouse/dhcp_agent.ini @@ -10,7 +10,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 dnsmasq_flags -%} +{% if instance_mtu or dnsmasq_flags -%} dnsmasq_config_file = /etc/neutron/dnsmasq.conf {% endif -%} diff --git a/templates/mitaka/dhcp_agent.ini b/templates/mitaka/dhcp_agent.ini index 43324b7f..4f70313a 100644 --- a/templates/mitaka/dhcp_agent.ini +++ b/templates/mitaka/dhcp_agent.ini @@ -11,7 +11,7 @@ interface_driver = openvswitch dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf -{% if dnsmasq_flags -%} +{% if instance_mtu or dnsmasq_flags -%} dnsmasq_config_file = /etc/neutron/dnsmasq.conf {% endif -%} diff --git a/templates/ocata/dhcp_agent.ini b/templates/ocata/dhcp_agent.ini index bb3de51d..7b3dd490 100644 --- a/templates/ocata/dhcp_agent.ini +++ b/templates/ocata/dhcp_agent.ini @@ -11,7 +11,7 @@ interface_driver = openvswitch dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf -{% if dnsmasq_flags -%} +{% if instance_mtu or dnsmasq_flags -%} dnsmasq_config_file = /etc/neutron/dnsmasq.conf {% endif -%}