Synchronise master with upstream

.ansible-lint

@@ -2,6 +2,7 @@
 exclude_paths:
   - .cache/  # implicit unless exclude_paths is defined in config
   - zuul.d/
+  - kolla/template/repos.yaml
 offline: true
 parseable: true
 profile: basic

doc/source/ceph_versions.csv

@@ -1,5 +1,5 @@
 Distro,Ceph,
 ,Source, Release
-Rocky Linux,CentOS Storage SIG,Reef
-Ubuntu,Ubuntu,Reef
+Rocky Linux,CentOS Storage SIG,Squid
+Ubuntu,Ubuntu,Squid
 Debian,Debian,Pacific

doc/source/contributor/versions.rst

@@ -10,7 +10,7 @@ For each component used we list version used at branch release and provide
 information about package sources.
 
 .. note::
-    When table mentions 'CentOS' it means both CentOS Stream 9 and Rocky Linux 9.
+    When table mentions 'CentOS' it means both CentOS Stream 10 and Rocky Linux 10.
 
 ==============  ================  =============================================
  Name           Version           Package source information

doc/source/support_matrix.rst

@@ -17,7 +17,7 @@ The following base container images are supported:
 ================== =============================== ================
 Distribution       Default base                    Default base tag
 ================== =============================== ================
-Rocky Linux        quay.io/rockylinux/rockylinux   9
+Rocky Linux        quay.io/rockylinux/rockylinux   10
 Debian Bookworm    debian                          bookworm
 Ubuntu Noble       ubuntu                          24.04
 ================== =============================== ================

docker/base/Dockerfile.j2

@@ -54,46 +54,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% endblock %}
 
 #### BEGIN REPO ENABLEMENT
-{% set base_yum_repo_files = [
-    'docker-ce.repo',
-    'grafana.repo',
-    'influxdb.repo',
-    'kolla_el10.repo',
-    'mariadb.repo',
-    'opensearch.repo',
-    'proxysql.repo',
-    'rabbitmq_rabbitmq-server.repo',
-    'td.repo',
-] %}
-
 {% set base_yum_url_packages = [
 ] %}
 
 {% set base_yum_repo_keys = [
 ] %}
 
-{% if base_arch == 'x86_64' %}
-    {% set base_yum_repo_files = base_yum_repo_files + [
-        'rabbitmq_rabbitmq-erlang.repo',
-    ] %}
-
-{% elif base_arch == 'aarch64' %}
-    {% set base_yum_repo_files = base_yum_repo_files + [
-        'copr-rabbitmq-erlang.repo',
-    ] %}
-
-{#
-SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management/rpm/issues/1977
-        'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
- #}
-    {% set base_yum_repo_keys = base_yum_repo_keys + [
-    ] %}
-{% endif %}
-
-{%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %}
-COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }}
-{%- endfor %}
-
 {% block base_centos_repo_overrides_post_copy %}{% endblock %}
 
 # Install what is needed for en_US.UTF-8
@@ -142,28 +108,18 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
     'dnf-plugins-core'
 ] %}
-{% set base_centos_yum_repos_to_enable = [
-] %}
-
-{% set base_centos_yum_repos_to_disable = [
-    'centos-ceph-squid',
-    'centos-nfv-openvswitch',
-    'epel',
-    'influxdb',
-    'opensearch-3.x',
-    'opensearch-dashboards-3.x',
-] %}
 
 RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}
 
-{%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%}
-
-{%- for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') %} && dnf config-manager --disable {{ repo }} {% endfor -%}
-
 {%- for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') %} && rpm --import {{ key }} {% endfor %} \
 {% block base_centos_repo_overrides_post_yum %}{% endblock -%}
     && {{ macros.rpm_security_update(clean_package_cache) }}
 
+{# NOTE(mnasiadka): dumb-init is only in EPEL10.1 onwards and RHEL/Rocky/clones use the same #}
+{#                    EPEL release as the installed distro release #}
+{# TODO: Remove it when Rocky 10.1 is out #}
+RUN dnf config-manager --save --setopt=*.metalink="https://mirrors.fedoraproject.org/metalink?repo=epel-z-10.1&arch=\$basearch" epel
+
 #### END REPO ENABLEMENT
 
 {# We are back to the basic if conditional here which is:
@@ -183,6 +139,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
         'lsof',
         'lvm2',
         'ncurses',
+        'openssl',
         'procps-ng',
         'python3',
         'python3-pip',
@@ -197,8 +154,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
 
 # Install base packages
 {{ macros.enable_extra_repos(['epel']) }}
-{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
-{{ macros.disable_extra_repos(['epel']) }}
+{{ macros.install_packages(base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages")) }}
 
 {# endif for base_package_type rpm #}
 {% elif base_package_type == 'deb' %}

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -11,14 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='bifrost') }}
 
-{# NOTE(mgoddard): EPEL required for nginx #}
-{{ macros.enable_extra_repos(['epel']) }}
-
 {% set bifrost_base_packages = [
     'cpio'
 ] %}
 
 {% if base_package_type == 'rpm' %}
+
+{# NOTE(mgoddard): EPEL required for nginx #}
+{{ macros.enable_extra_repos(['epel']) }}
+
     {% set bifrost_base_packages = bifrost_base_packages + [
         'python3.12',
         'python3.12-devel'

docker/cinder/cinder-base/Dockerfile.j2

@@ -9,9 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='cinder') }}
 
+{% if base_package_type == 'rpm' %}
+
 {{ macros.enable_extra_repos(['ceph', 'epel']) }}
 
-{% if base_package_type == 'rpm' %}
     {% set cinder_base_packages = [
         'ceph-common',
         'cryptsetup',

docker/collectd/Dockerfile.j2

@@ -9,13 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='collectd') }}
 
-{{ macros.enable_extra_repos(['opstools']) }}
-
 {% set collectd_packages = [
     'collectd'
 ] %}
 
 {% if base_package_type == 'rpm' %}
+
+{{ macros.enable_extra_repos(['opstools']) }}
+
   {% set collectd_packages = collectd_packages + [
       'collectd-amqp',
       'collectd-amqp1',

docker/dnsmasq/extend_start.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+DNSMASQ_PIDFILE=${DNSMASQ_PIDFILE:-/run/ironic/dnsmasq.pid}
+DNSMASQ_PIDFILE_DIR="$(dirname $DNSMASQ_PIDFILE)"
+
 if [[ ! -d "/var/log/kolla/ironic" ]]; then
     mkdir -p /var/log/kolla/ironic
 fi
@@ -10,3 +13,19 @@ if [[ ! -r "/var/log/kolla/ironic/dnsmasq.log" ]]; then
     touch /var/log/kolla/ironic/dnsmasq.log
     chown ironic:ironic /var/log/kolla/ironic/dnsmasq.log
 fi
+
+if [[ ! -d "$DNSMASQ_PIDFILE_DIR" ]]; then
+    mkdir -p "$DNSMASQ_PIDFILE_DIR"
+fi
+
+# NOTE(wszumski): This writes the PID of dnsmasq out to a file. The PIDFILE can be used in
+# another container to send a signal to dnsmasq to reload its config (providing that the two
+# containers share a PID namespace). The concrete use case is for the Ironic PXE filter to
+# clean up stale host entries on startup as documented in:
+#
+# https://docs.openstack.org/ironic/latest/admin/inspection/pxe_filter.html
+#
+# We cannot use the pid-file option in dnsmasq, since it will only write the PIDFILE if you
+# run dnsmasq in its non-forking mode i.e you do use the --no-daemon or --keep-in-foreground
+# options.
+echo $$ > "$DNSMASQ_PIDFILE"

docker/glance/glance-base/Dockerfile.j2

@@ -9,9 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='glance') }}
 
+{% if base_package_type == 'rpm' %}
+
 {{ macros.enable_extra_repos(['ceph', 'epel']) }}
 
-{% if base_package_type == 'rpm' %}
     {% set glance_base_packages = [
         'python3-rados',
         'python3-rbd'

docker/gnocchi/gnocchi-base/Dockerfile.j2

@@ -9,10 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='gnocchi') }}
 
-{{ macros.enable_extra_repos(['ceph', 'epel']) }}
-
 {% if base_package_type == 'rpm' %}
 
+{{ macros.enable_extra_repos(['ceph', 'epel']) }}
+
     {% set gnocchi_base_packages = [
         'librados2-devel',
         'python3-rados',

docker/hacluster/hacluster-base/Dockerfile.j2

@@ -7,8 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
+{% if base_package_type =='rpm' %}
+
 {{ macros.enable_extra_repos(['hacluster']) }}
 
+{% endif %}
+
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN chmod 644 /usr/local/bin/kolla_extend_start