From a76d93dfb9592830623cce46e2033d3542fd1da4 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 31 Aug 2023 14:45:02 +0200 Subject: [PATCH] Pin iptables to 1.8.4 in Centos Stream 8 Bug in Centos Stream 8: [1] https://bugzilla.redhat.com/show_bug.cgi?id=2236501 Change-Id: I87c5c3792c400f9bc90d00ebc5fc858f3a2b02e2 (cherry picked from commit 8f076857fde79477432c1377559a452c265297ce) --- docker/neutron/neutron-base/Dockerfile.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 81a43b6fa7..e59c985cee 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -57,7 +57,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'haproxy', 'iproute-tc', 'ipset', - 'iptables', 'iputils', 'keepalived', 'net-tools', @@ -67,6 +66,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'uuid' ] %} + {% if base_distro == "centos" and base_distro_tag.startswith('stream8') %} + {% set neutron_base_packages = neutron_base_packages + [ + 'iptables-1.8.4*' + ] %} + {% else %} + {% set neutron_base_packages = neutron_base_packages + [ + 'iptables' + ] %} + {% endif %} + {% elif base_package_type == 'deb' %} {% set neutron_base_packages = [