Merge pull request #511 from stackhpc/upstream/master-2026-01-19

Synchronise master with upstream

Author: Alex-Welsh

docker/base/Dockerfile.j2

@@ -247,7 +247,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'docker-ce', 'url': 'https://download.docker.com/linux/debian/gpg'},
    {'name': 'fluentd', 'url': 'https://fluentd.cdn.cncf.io/GPG-KEY-fluent-package'},
    {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
-   {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
+   {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
    {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch-release.pgp'},
    {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key'},

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -28,13 +28,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.install_packages(bifrost_base_packages | customizable("packages")) }}
 
-{# Ensure we use Python 3.12 on RPM-based systems #}
-{% if base_package_type == 'rpm' %}
-RUN cd /usr/bin && \
-    rm -f python3 && \
-    ln -s python3.12 python3
-{% endif %}
-
 ENV VENV {{ venv_path }}
 
 {% set bifrost_base_pip_packages = [
@@ -47,12 +40,7 @@ COPY build_arg.yml /tmp/build_arg.yml
 RUN mkdir -p /requirements \
     && curl -o /requirements/upper-constraints.txt ${UPPER_CONSTRAINTS_FILE:-https://releases.openstack.org/constraints/upper/{{ openstack_release }}} \
     && python3 -m venv --system-site-packages {{ venv_path }} \
-    && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \
-    && cd {{ venv_path }}/lib \
-    && rm -f python3 \
-    && ln -s python${KOLLA_DISTRO_PYTHON_VERSION} python3
-
-RUN ln -s bifrost-base-source/* bifrost \
+    && ln -s bifrost-base-source/* bifrost \
     && {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
     && {{ macros.install_pip(bifrost_base_pip_packages | customizable("pip_packages")) }}
 
@@ -67,7 +55,7 @@ RUN apt-get --error-on=any update && \
 {%- else %}
 RUN echo " " && \
 {%- endif %}
-    bash -c '$VENV/bin/pip install "ansible>=12,<13" && \
+    bash -c '$VENV/bin/pip install "ansible>=12,<14" && \
     $VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
     $VENV/bin/ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
     /bifrost/playbooks/install.yaml \

docker/kolla-toolbox/Dockerfile.j2

@@ -96,7 +96,7 @@ RUN mkdir -p /requirements \
 ENV PATH {{ venv_path }}/bin:$PATH
 
 {% set kolla_toolbox_pip_packages = [
-        'ansible-core==2.19.*',
+        'ansible-core==2.20.*',
         'cmd2',
         'influxdb',
         'openstacksdk',

docker/kolla-toolbox/ansible.cfg

@@ -1,3 +1,4 @@
 [defaults]
-remote_tmp = /tmp
+inject_facts_as_vars = False
 log_path = /var/log/kolla/ansible.log
+remote_tmp = /tmp

docker/kolla-toolbox/requirements.yml

@@ -1,11 +1,11 @@
 ---
 collections:
   - name: ansible.posix
-    version: '<2'
+    version: '<3'
   - name: community.general
-    version: '<4'
+    version: '<13'
   - name: community.mysql
-    version: '<3'
+    version: '<5'
   - name: community.rabbitmq
     version: '<2'
   - name: openstack.cloud

kolla/template/repos.yaml

@@ -147,7 +147,7 @@ rpm:
     distro: true
   influxdb:
     baseurl: "https://repos.influxdata.com/rhel/9/$basearch/stable"
-    gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key"
+    gpgkey: "https://repos.influxdata.com/influxdata-archive.key"
     name: "influxdb"
   kolla_el10:
     baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/"

releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Version of ``ansible-core`` in ``kolla-toolbox`` has been updated to
+    ``2.20``.

releasenotes/notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Updates the InfluxDB repository GPG key from the expired
+    ``influxdata-archive_compat.key`` to the recommended
+    ``influxdata-archive.key`` as per https://repos.influxdata.com.

tests/playbooks/publish.yml

@@ -37,7 +37,7 @@
             url: "https://quay.io/api/v1/repository/{{ item.RepoTags.0 }}/changevisibility"
             method: POST
             headers:
-              Authorization: "Bearer {{ kolla_quay_io_api_oct_2025.token | trim }}"
+              Authorization: "Bearer {{ kolla_quay_io_api.token | trim }}"
             body: '{"visibility": "public"}'
             body_format: json
           loop: "{{ docker_host_info.images }}"

zuul.d/debian.yaml

@@ -24,8 +24,10 @@
       kolla_registry: quay.io
       kolla_namespace: openstack.kolla
     secrets:
-      - kolla_quay_io_creds
-      - kolla_quay_io_api_oct_2025
+      - name: kolla_quay_io_creds
+        secret: kolla_quay_io_creds_jan_2026
+      - name: kolla_quay_io_api
+        secret: kolla_quay_io_api_jan_2026
 
 - job:
     name: kolla-publish-debian-trixie-arm64-quay
@@ -36,8 +38,10 @@
       kolla_registry: quay.io
       kolla_namespace: openstack.kolla
     secrets:
-      - kolla_quay_io_creds
-      - kolla_quay_io_api_oct_2025
+      - name: kolla_quay_io_creds
+        secret: kolla_quay_io_creds_jan_2026
+      - name: kolla_quay_io_api
+        secret: kolla_quay_io_api_jan_2026
 
 - job:
     name: kolla-build-debian-trixie-no-infra-wheels