openstack
/
charm-neutron-openvswitch
Code Issues Proposed changes

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
This commit is contained in:
Frode Nordahl 2020-07-16 16:49:34 +02:00
parent 010ac09350
commit e17d73c416
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/dhcp_agent.ini
View File

@ -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 -%}

2
templates/mitaka/dhcp_agent.ini
View File

@ -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 -%}

2
templates/ocata/dhcp_agent.ini
View File

@ -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 -%}