From a23158bf220be16f1eecc244e88e5244da433077 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 11 Dec 2018 15:56:21 +0100
Subject: Make MTU cluster-level configurable via IDF

JIRA: FUEL-336

Change-Id: I1c8d22b8322f700eb727d9077035ba4c9f9f9753
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit e2c175f3114fb1857ab8ab4bb7e8ff2f8daf18bd)
---
 mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml    | 1 -
 mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 5 ++---
 .../classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2     | 1 +
 mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml    | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'mcp/reclass/classes/cluster/mcp-common-noha')

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index efdc2ffb1..5b68f7d92 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -21,7 +21,6 @@ classes:
   - cluster.mcp-common-noha.openstack_compute_pdf
 parameters:
   _param:
-    interface_mtu: 9000
     linux_system_codename: xenial
   nova:
     compute:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index 2891664d3..62873ebf7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -72,7 +72,6 @@ classes:
   - cluster.mcp-common-noha.openstack_control_pdf
 parameters:
   _param:
-    interface_mtu: 9000
     linux_system_codename: xenial
     ceilometer_create_gnocchi_resources: 'True'
     barbican_integration_enabled: 'false'
@@ -185,9 +184,9 @@ parameters:
     server:
       vlan_aware_vms: true
       root_helper_daemon: false
-      global_physnet_mtu: 9000
+      global_physnet_mtu: ${_param:interface_mtu}
       backend:
-        external_mtu: 9000
+        external_mtu: ${_param:interface_mtu}
 {%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
       bgp_vpn:
         enabled: True
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2
index 7a1c3532d..06df3b845 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2
@@ -22,6 +22,7 @@ parameters:
           type: eth
           address: ${_param:pxe_admin_address}
           netmask: ${_param:opnfv_net_admin_mask}
+          mtu: ${_param:interface_mtu}
           noifupdown: true
 
 {#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index 0062adf16..f29cb867c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -11,7 +11,6 @@ classes:
   - cluster.mcp-common-noha.openstack_gateway_pdf
 parameters:
   _param:
-    interface_mtu: 9000
     linux_system_codename: xenial
   neutron:
     gateway:
-- 
cgit 1.2.3-korg