From 907847acbba46a987eff97e15cee0a63e69d1418 Mon Sep 17 00:00:00 2001
From: Sergey Vasilenko <svasilenko@mirantis.com>
Date: Tue, 7 Jun 2016 17:32:43 +0300
Subject: [PATCH] Add ability to override MTU for networks

* This patch make ability for override ML2/path_mtu into:
      quantum_settings:
        . . .
        L2:
          segmentation_type: tun
          path_mtu: 8000
          tunnel_id_ranges: 2:65535

Change-Id: Ibb4c984751cd234db4a481819e390a79c27545d0
Closes-bug: #1589944
---
 .../openstack_network/server_config.pp        | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
index ac0dc68147..1f4eb23dae 100644
--- a/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
+++ b/deployment/puppet/openstack_tasks/manifests/openstack_network/server_config.pp
@@ -136,6 +136,14 @@ class openstack_tasks::openstack_network::server_config {
         'do_tenant'   => true,
         'do_provider' => false
       })
+
+      $_path_mtu = try_get_value($neutron_config, 'L2/path_mtu', undef)
+      if $_path_mtu {
+        $path_mtu = $_path_mtu
+      } else {
+        $path_mtu = undef
+      }
+
       $network_vlan_ranges = generate_physnet_vlan_ranges($neutron_config, $network_scheme, {
         'do_floating' => $do_floating,
         'do_tenant'   => true,
@@ -155,6 +163,13 @@ class openstack_tasks::openstack_network::server_config {
       })
       $network_vlan_ranges = []
 
+      $_path_mtu = try_get_value($neutron_config, 'L2/path_mtu', undef)
+      if $_path_mtu {
+        $path_mtu = $_path_mtu
+      } else {
+        $path_mtu = pick(get_transformation_property('mtu', $iface[0]), '1500')
+      }
+
       if $segmentation_type == 'gre' {
         $network_type = 'gre'
       } else {
@@ -163,8 +178,6 @@ class openstack_tasks::openstack_network::server_config {
       }
     }
 
-    $physical_net_mtu = pick(get_transformation_property('mtu', $iface[0]), '1500')
-
     if $compute and ! $dvr {
       $do_floating = false
     } else {
@@ -184,7 +197,7 @@ class openstack_tasks::openstack_network::server_config {
       vxlan_group               => $vxlan_group,
       vni_ranges                => $tunnel_id_ranges,
       physical_network_mtus     => $physical_network_mtus,
-      path_mtu                  => $physical_net_mtu,
+      path_mtu                  => $path_mtu,
       extension_drivers         => $extension_drivers,
       supported_pci_vendor_devs => $pci_vendor_devs,
       sriov_agent_required      => $use_sriov,