From 8f43c9af3ca49498659fb3caa08162504b50ab07 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 11 Dec 2018 16:00:45 +0100 Subject: [PATCH] [fuel] IDF: Add idf.fuel.network.interface_mtu Allow configuring cluster-level jumbo frames via IDF. All virtual PODs default to using jumbo frames, while baremetal PODs will keep using 1500 until we confirm all switches are properly configured. While at it, update net_macros to configure MTU for VLAN interfaces too. JIRA: FUEL-336 Change-Id: Id6c7ec9377b15d53e69c8cbb16fa469b52ab7e3a Signed-off-by: Alexandru Avadanii --- config/installers/fuel/net_macros.j2 | 1 + config/pdf/idf-pod1.schema.yaml | 2 ++ labs/arm/idf-virtual2.yaml | 1 + labs/ericsson/idf-virtual-pod1bl01.yaml | 1 + labs/ericsson/idf-virtual1.yaml | 1 + labs/ericsson/idf-virtual2.yaml | 1 + labs/ericsson/idf-virtual3.yaml | 1 + labs/ericsson/idf-virtual4.yaml | 1 + labs/ericsson/idf-virtual5.yaml | 1 + 9 files changed, 10 insertions(+) diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2 index b9693d11..7ff3166c 100644 --- a/config/installers/fuel/net_macros.j2 +++ b/config/installers/fuel/net_macros.j2 @@ -23,6 +23,7 @@ {{ vlans[vlan] }}.{{ vlan }}: enabled: true proto: manual + mtu: ${_param:interface_mtu} type: vlan name: {{ vlans[vlan] }}.{{ vlan }} use_interfaces: diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml index a1108a00..7546279d 100644 --- a/config/pdf/idf-pod1.schema.yaml +++ b/config/pdf/idf-pod1.schema.yaml @@ -63,6 +63,8 @@ definitions: network: type: 'object' properties: + interface_mtu: + type: 'number' ntp_strata_host1: type: 'string' ntp_strata_host2: diff --git a/labs/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml index fa83e191..ba025d00 100644 --- a/labs/arm/idf-virtual2.yaml +++ b/labs/arm/idf-virtual2.yaml @@ -57,6 +57,7 @@ idf: private: ~ public: 'public' network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual-pod1bl01.yaml b/labs/ericsson/idf-virtual-pod1bl01.yaml index 528152cb..8e172d95 100644 --- a/labs/ericsson/idf-virtual-pod1bl01.yaml +++ b/labs/ericsson/idf-virtual-pod1bl01.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual1.yaml b/labs/ericsson/idf-virtual1.yaml index e7ba00fb..08d2812a 100644 --- a/labs/ericsson/idf-virtual1.yaml +++ b/labs/ericsson/idf-virtual1.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual2.yaml b/labs/ericsson/idf-virtual2.yaml index 586661a4..e51d5450 100644 --- a/labs/ericsson/idf-virtual2.yaml +++ b/labs/ericsson/idf-virtual2.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual3.yaml b/labs/ericsson/idf-virtual3.yaml index 4a7aa82d..a398499c 100644 --- a/labs/ericsson/idf-virtual3.yaml +++ b/labs/ericsson/idf-virtual3.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual4.yaml b/labs/ericsson/idf-virtual4.yaml index ddcd621c..cac78af7 100644 --- a/labs/ericsson/idf-virtual4.yaml +++ b/labs/ericsson/idf-virtual4.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: diff --git a/labs/ericsson/idf-virtual5.yaml b/labs/ericsson/idf-virtual5.yaml index 067ec0c0..7e2b3a4d 100644 --- a/labs/ericsson/idf-virtual5.yaml +++ b/labs/ericsson/idf-virtual5.yaml @@ -58,6 +58,7 @@ idf: private: ~ public: ~ network: + interface_mtu: 9000 ntp_strata_host1: 1.se.pool.ntp.org ntp_strata_host2: 0.se.pool.ntp.org node: -- 2.16.6