From 4a99be6bf68675179c392f04c7f2ea2e650c497e Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Wed, 15 Mar 2017 16:42:23 +0000
Subject: [PATCH] Use global_physnet_mtu config in newton templates

The Newton neutron.conf template was missing the snippet to
support configuration of the underlying physical network MTU.

Add this snippet based on the Mitaka template, and tweak the
Mitaka template to insert the snippet prior to the zeromq
section config.

Change-Id: If38c2e056df8215d717bd29b46ff2fa0d0c6024d
Closes-Bug: 1673161
---
 templates/mitaka/neutron.conf | 4 ++--
 templates/newton/neutron.conf | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf
index 72e9bd24..42f53a20 100644
--- a/templates/mitaka/neutron.conf
+++ b/templates/mitaka/neutron.conf
@@ -69,12 +69,12 @@ notify_nova_on_port_data_changes = True
 {% endfor -%}
 {% endif -%}
 
-{% include "section-zeromq" %}
-
 {% if global_physnet_mtu -%}
 global_physnet_mtu = {{ global_physnet_mtu }}
 {% endif -%}
 
+{% include "section-zeromq" %}
+
 [quotas]
 {% if quota_driver -%}
 quota_driver = {{ quota_driver }}
diff --git a/templates/newton/neutron.conf b/templates/newton/neutron.conf
index 6c09a5c3..a08e52df 100644
--- a/templates/newton/neutron.conf
+++ b/templates/newton/neutron.conf
@@ -69,6 +69,10 @@ notify_nova_on_port_data_changes = True
 {% endfor -%}
 {% endif -%}
 
+{% if global_physnet_mtu -%}
+global_physnet_mtu = {{ global_physnet_mtu }}
+{% endif -%}
+
 {% include "section-zeromq" %}
 
 [quotas]