From cf074202e50426365c761326c8d2ccfcce4ad916 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Sat, 21 Sep 2019 17:16:58 -0700 Subject: [PATCH] Change MTU logic to allow for lower MTUs automatically Change-Id: I40d357e716b589585493824cfd963fd5f579bd81 --- devstack/settings | 6 +++++- zuul.d/ironic-jobs.yaml | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devstack/settings b/devstack/settings index 9783efdd65..cafa85384a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -9,4 +9,8 @@ source $DEST/ironic/devstack/common_settings local_mtu=$(ip link show | sed -ne 's/.*mtu \([0-9]\+\).*/\1/p' | sort -n | head -1) # 50 bytes is overhead for vxlan (which is greater than GRE # allowing us to use either overlay option with this MTU. -PUBLIC_BRIDGE_MTU=${OVERRIDE_PUBLIC_BRIDGE_MTU:-$((local_mtu - 50))} +# However, if traffic is flowing over IPv6 tunnels, then +# The overhead is essentially another 100 bytes. In order to +# handle both cases, lets go ahead and drop the maximum by +# 100 bytes. +PUBLIC_BRIDGE_MTU=${OVERRIDE_PUBLIC_BRIDGE_MTU:-$((local_mtu - 100))} diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 8c4bb8b75d..d048e50d8e 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -30,7 +30,6 @@ DEFAULT_INSTANCE_TYPE: baremetal FORCE_CONFIG_DRIVE: True INSTALL_TEMPEST: False # Don't install a tempest package globaly - OVERRIDE_PUBLIC_BRIDGE_MTU: 1350 TEMPEST_PLUGINS: "{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-tempest-plugin" VIRT_DRIVER: ironic BUILD_TIMEOUT: 720 @@ -391,7 +390,6 @@ IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_SPECS_RAM: 384 IRONIC_VM_SPECS_DISK: 4 - OVERRIDE_PUBLIC_BRIDGE_MTU: 1350 OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra' OVS_PHYSICAL_BRIDGE: brbm PHYSICAL_NETWORK: mynetwork