From 6a8e8a7fe7c177dca06a2c211552bc4ffb8a9c2b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 31 Jan 2023 11:27:54 +0100
Subject: [PATCH 1/4] neutron: Add iproute-tc

Closes-Bug: #2000782
Change-Id: I5cf944c509f23d430665de458cbbdb2fd31db7bb
(cherry picked from commit d7d43bed84dff0c394a28730fef593bdfbb064f2)
---
 docker/neutron/neutron-base/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index d2dee2d5f3..81a43b6fa7 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set neutron_base_packages = [
+            'iproute-tc',
             'iputils',
             'keepalived',
             'net-tools',
@@ -54,6 +55,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'dnsmasq',
             'dnsmasq-utils',
             'haproxy',
+            'iproute-tc',
             'ipset',
             'iptables',
             'iputils',

From 8e8ef4c38999b95cd989fc4ba7580874807e706d Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 4 May 2023 15:09:17 +0200
Subject: [PATCH 2/4] fluentd: cap elasticsearch again

Closes-Bug: #2018463
Change-Id: If5bec23cb4945fea7eba87a4c9252b1ae201ce05
---
 docker/fluentd/Dockerfile.j2 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
index 3351fcda42..331a605e0e 100644
--- a/docker/fluentd/Dockerfile.j2
+++ b/docker/fluentd/Dockerfile.j2
@@ -31,12 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name=fluentd_user, groups='mysql') }}
 
-# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES
-{{ macros.install_packages(fluentd_packages | customizable("packages")) }} \
-    && td-agent-gem install elasticsearch:7.13.0 \
-    && td-agent-gem uninstall "elasticsearch:>7.13.0" \
-    && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
-    && td-agent-gem uninstall "elasticsearch-transport:>7.13.0"
+{{ macros.install_packages(fluentd_packages | customizable("packages")) }}
 
 COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
 
@@ -57,7 +52,13 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
     'fluent-plugin-rewrite-tag-filter',
 ] %}
 
-{{ macros.install_fluent_plugins(fluentd_plugins | customizable("plugins")) }}
+{# NOTE(frickler): Downgrading elasticsearch gems for compatibility with OSS versions of ES #}
+{{ macros.install_fluent_plugins(fluentd_plugins | customizable("plugins")) }} \
+    && td-agent-gem install elasticsearch:7.13.0 \
+    && td-agent-gem uninstall "elasticsearch:>7.13.0" \
+    && td-agent-gem uninstall "elasticsearch-api:>7.13.0" \
+    && td-agent-gem uninstall "elasticsearch-transport:>7.13.0" \
+    && td-agent-gem uninstall "elastic-transport:>7.13.0"
 
 {% endblock %}
 

From e590ec353841db16a96ad68f7ad5a13bbf7ee168 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 6 Mar 2023 18:27:46 +0100
Subject: [PATCH 3/4] https: remove dhparams.pem before running gencerts

On EL9 the file exists and script errors with wrong
permissions to it.

Closes-Bug: #2011716
Change-Id: Ib32baa3208e6bfc5520ff8537193c9a4d6cbada7
(cherry picked from commit 12d431e3994023ce735a2352554a99a5cc9431c9)
---
 docker/base/httpd_setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh
index 3dbf84853e..5232f4ed17 100644
--- a/docker/base/httpd_setup.sh
+++ b/docker/base/httpd_setup.sh
@@ -24,7 +24,9 @@ if [[ "$(whoami)" == 'root' ]]; then
     # on startup:
     #   SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty
     # Work around this by generating certificates manually.
+    # NOTE(mnasiadka): in EL9 upgrade jobs gencerts is failing on wrong permissions to dhparams.pem
     if [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then
+        rm -f /tmp/dhparams.pem
         /usr/libexec/httpd-ssl-gencerts
     fi
 fi

From a28b7d7a0bac0f265a997f7576db9cb82b2022c1 Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Tue, 9 May 2023 09:58:59 +0100
Subject: [PATCH 4/4] Support qemu block rbd in nova-compute (source)

Corrects backport of change 860230: Support qemu block rbd in nova-compute | https://review.opendev.org/c/openstack/kolla/+/860230 to also consider source install type.

Change-Id: I3d10973a9857355e68007d70258e8d7b0ab36b85
---
 docker/nova/nova-compute/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 69d552e1fe..67cafa2a93 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -111,6 +111,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'python3-libvirt',
             'python3-rtslib',
             'qemu-img',
+            'qemu-kvm-block-rbd',
             'sysfsutils',
             'targetcli',
             'xfsprogs'
@@ -149,6 +150,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'python3-rados',
             'python3-rbd',
             'python3-rtslib-fb',
+            'qemu-block-extra',
             'qemu-utils',
             'sasl2-bin',
             'sysfsutils',