Merge pull request #224 from stackhpc/upstream/yoga-2023-05-15

Synchronise yoga with upstream

Author: markgoddard

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

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 %}
 

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',

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',