diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-23 13:00:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-23 13:00:04 +0000 |
| commit | 27f81a89b15eae5a5cb106af9464c9a7721e57d5 (patch) | |
| tree | 4fd5a911fa5cfc7fcf62c47a2bc4f3a72d9293a1 | |
| parent | 35ded83a91b6889123e519a8e1833926fa33080c (diff) | |
| parent | 4dab3dde694da0f6327ec92e3e56e4f9d47ef54e (diff) | |
| download | ironic-27f81a89b15eae5a5cb106af9464c9a7721e57d5.tar.gz | |
Merge "Change MTU logic to allow for lower MTUs automatically" into stable/stein
| -rw-r--r-- | devstack/settings | 6 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/devstack/settings b/devstack/settings index 9783efdd6..cafa85384 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 128c55c3c..ca6b0c6f4 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -29,7 +29,6 @@ DEFAULT_INSTANCE_TYPE: baremetal FORCE_CONFIG_DRIVE: True INSTALL_TEMPEST: False # Don't install a tempest package globaly - OVERRIDE_PUBLIC_BRIDGE_MTU: 1400 TEMPEST_PLUGINS: "{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-tempest-plugin" VIRT_DRIVER: ironic BUILD_TIMEOUT: 720 @@ -364,7 +363,6 @@ IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_SPECS_RAM: 384 OS_TEST_TIMEOUT: 2400 - OVERRIDE_PUBLIC_BRIDGE_MTU: 1400 OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra' OVS_PHYSICAL_BRIDGE: brbm PHYSICAL_NETWORK: mynetwork |