commit 4b41022889c36944c26c6db43c27fcd2cdd92c01
author Dmitry Stremkouski <dstremkouski@mirantis.com> Sat Nov 18 11:29:55 2017 +0300
committer Dmitry Stremkouski <dstremkouski@mirantis.com> Wed Nov 22 15:09:51 2017 +0300
tree 89cded7c2caba802add2f06ca78a8458c13edc09
parent a9814a46d823ecd083f79fd3d063ff28f48dc94b

One should be able to set up different mtus for different physnets

external_mtu may differ from tenant_net_mtu
This patchset fixes that issue

Customer-Found
Change-Id: I1eeb6cffd5e8d940ddced41e4a94c7b973f67c2e

README.rst

diff --git a/README.rst b/README.rst
index 416f93b..ef03151 100644
--- a/README.rst
+++ b/README.rst
@@ -287,6 +287,21 @@
         external_access: false
 
 
+Specify different mtu values for different physnets
+---------------------------------------------------
+
+Neutron Server
+
+.. code-block:: yaml
+
+    neutron:
+      server:
+        version: mitaka
+        backend:
+          external_mtu: 1500
+          tenant_net_mtu: 9000
+          ironic_net_mtu: 9000
+
 Neutron VXLAN tenant networks with Network Nodes (non DVR)
 ----------------------------------------------------------
 

neutron/files/mitaka/ml2_conf.ini

diff --git a/neutron/files/mitaka/ml2_conf.ini b/neutron/files/mitaka/ml2_conf.ini
index 2b8dab3..afd6bf4 100644
--- a/neutron/files/mitaka/ml2_conf.ini
+++ b/neutron/files/mitaka/ml2_conf.ini
@@ -123,10 +123,10 @@
 {%- do physical_network_mtus.append(['physnet1',server.backend.get('external_mtu', '1500')]|join(":")) %}
 {%- endif %}
 {%- if "vlan" in server.backend.tenant_network_types %}
-{%- do physical_network_mtus.append(['physnet2',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet2',server.backend.get('tenant_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 {%- if server.get('ironic_enabled', False) %}
-{%- do physical_network_mtus.append(['physnet3',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet3',server.backend.get('ironic_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 physical_network_mtus = {{ ','.join(physical_network_mtus) }}
 

neutron/files/newton/ml2_conf.ini

diff --git a/neutron/files/newton/ml2_conf.ini b/neutron/files/newton/ml2_conf.ini
index 2b8dab3..afd6bf4 100644
--- a/neutron/files/newton/ml2_conf.ini
+++ b/neutron/files/newton/ml2_conf.ini
@@ -123,10 +123,10 @@
 {%- do physical_network_mtus.append(['physnet1',server.backend.get('external_mtu', '1500')]|join(":")) %}
 {%- endif %}
 {%- if "vlan" in server.backend.tenant_network_types %}
-{%- do physical_network_mtus.append(['physnet2',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet2',server.backend.get('tenant_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 {%- if server.get('ironic_enabled', False) %}
-{%- do physical_network_mtus.append(['physnet3',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet3',server.backend.get('ironic_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 physical_network_mtus = {{ ','.join(physical_network_mtus) }}
 

neutron/files/ocata/ml2_conf.ini

diff --git a/neutron/files/ocata/ml2_conf.ini b/neutron/files/ocata/ml2_conf.ini
index b61e313..95d4771 100644
--- a/neutron/files/ocata/ml2_conf.ini
+++ b/neutron/files/ocata/ml2_conf.ini
@@ -170,10 +170,10 @@
 {%- do physical_network_mtus.append(['physnet1',server.backend.get('external_mtu', '1500')]|join(":")) %}
 {%- endif %}
 {%- if "vlan" in server.backend.tenant_network_types %}
-{%- do physical_network_mtus.append(['physnet2',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet2',server.backend.get('tenant_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 {%- if server.get('ironic_enabled', False) %}
-{%- do physical_network_mtus.append(['physnet3',server.backend.get('external_mtu', '1500')]|join(":")) %}
+{%- do physical_network_mtus.append(['physnet3',server.backend.get('ironic_net_mtu', server.backend.get('external_mtu', '1500'))]|join(":")) %}
 {%- endif %}
 physical_network_mtus = {{ ','.join(physical_network_mtus) }}
 

tests/pillar/control_single.sls

diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 2eb905e..d59669b 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -2,6 +2,9 @@
   server:
     enabled: true
     backend:
+      external_mtu: 1500
+      tenant_net_mtu: 9000
+      ironic_net_mtu: 9000
       engine: contrail
       #contrail_discovery_host
       host: 127.0.0.1