From dd9340608cebff98362abe128ce92c5b33866455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 11 Jan 2021 21:21:55 +0100 Subject: [PATCH] Fix mtu reference in standalone template The standalone documentation instructs to use the 'InterfaceLocalMtu' parameter to define the MTU for the interface. The 'local_mtu' variable used in the standalone template get's the value of {{role.name}}LocalMtu. This changes the standalone template to use the value of the 'ctlplane_mtu', which in the depends on is set from the 'InterfaceLocalMtu' parameter. Depends-On: https://review.opendev.org/769709 Change-Id: I95dac5daa3176286fa5f83d27368aa2a54c32186 --- .../tripleo_network_config/molecule/default/converge.yml | 2 +- .../roles/tripleo_network_config/templates/standalone.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml b/tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml index 1452c20cc..4e8d2317a 100644 --- a/tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml +++ b/tripleo_ansible/roles/tripleo_network_config/molecule/default/converge.yml @@ -22,7 +22,7 @@ tripleo_network_config_template: templates/standalone.j2 tripleo_network_config_manage_service: false tripleo_network_config_hide_sensitive_logs: false - local_mtu: 1500 + ctlplane_mtu: 1500 ctlplane_ip: 203.0.113.1 ctlplane_subnet_cidr: 24 ctlplane_host_routes: [] diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2 index f3ce72985..6376f42a4 100644 --- a/tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2 +++ b/tripleo_ansible/roles/tripleo_network_config/templates/standalone.j2 @@ -15,7 +15,7 @@ network_config: - type: ovs_bridge name: br-ctlplane use_dhcp: false - mtu: {{ local_mtu }} + mtu: {{ ctlplane_mtu }} ovs_extra: - br-set-external-id br-ctlplane bridge-id br-ctlplane addresses: @@ -29,4 +29,4 @@ network_config: - type: interface name: {{ neutron_public_interface_name }} primary: true - mtu: {{ local_mtu }} + mtu: {{ ctlplane_mtu }}