Synchronise master with upstream

docker/aodh/aodh-base/Dockerfile.j2

@@ -13,7 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 ] %}
 
 {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh
 
 ADD aodh-base-archive /aodh-base-source
 
@@ -26,13 +25,11 @@ COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
 
 RUN ln -s aodh-base-source/* aodh \
     && {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/aodh /var/www/cgi-bin/aodh \
-    && cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
+    && mkdir -p /etc/aodh \
     && cp /aodh/aodh/api/api-paste.ini /etc/aodh/ \
     && chmod 644 /etc/aodh/api-paste.ini \
     && chmod 750 /etc/sudoers.d \
     && chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
-    && chmod 755 /var/www/cgi-bin/aodh \
     && touch /usr/local/bin/kolla_aodh_extend_start \
     && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
 

zuul.d/project.yaml

@@ -19,6 +19,7 @@
       - kolla-scenario-masakari
       - kolla-scenario-octavia
       - kolla-scenario-ovn
+      - kolla-scenario-telemetry
       - kolla-tox-genconfig
       - openstack-python3-jobs
       - openstack-python3-jobs-arm64

zuul.d/scenarios/aio.yaml

@@ -23,7 +23,7 @@
       jobs:
         - kolla-ansible-centos-10s-aarch64:
             files: ^docker/
-        - kolla-ansible-debian-bookworm-aarch64:
+        - kolla-ansible-debian-trixie-aarch64:
             files: ^docker/
     gate:
       jobs:

zuul.d/scenarios/bifrost.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible Bifrost scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-bifrost:
+        - kolla-ansible-debian-trixie-bifrost:
             files: ^docker/bifrost/
         - kolla-ansible-rocky-10-bifrost:
             files: ^docker/bifrost/

zuul.d/scenarios/cells.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible Nova Cells scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-cells:
+        - kolla-ansible-debian-trixie-cells:
             files: ^docker/proxysql/
         - kolla-ansible-rocky-10-cells:
             files: ^docker/proxysql/

zuul.d/scenarios/cephadm.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible CephAdm scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-cephadm:
+        - kolla-ansible-debian-trixie-cephadm:
             files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*
         - kolla-ansible-debian-bookworm-cephadm-upgrade:
             files: ^docker\/(base|cinder|glance|mariadb-server|openstack-base|rabbitmq)\/.*

zuul.d/scenarios/ironic.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible Ironic scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-ironic:
+        - kolla-ansible-debian-trixie-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
         - kolla-ansible-rocky-10-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*

zuul.d/scenarios/mariadb.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible MariaDB scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-mariadb:
+        - kolla-ansible-debian-trixie-mariadb:
             files: ^docker/(base|mariadb-server)/
         - kolla-ansible-rocky-10-mariadb:
             files: ^docker/(base|mariadb-server)/

zuul.d/scenarios/masakari.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible Masakari scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-masakari:
+        - kolla-ansible-debian-trixie-masakari:
             files: ^docker/(base|masakari|openstack-base)/
         - kolla-ansible-rocky-10-masakari:
             files: ^docker/(base|masakari|openstack-base)/

zuul.d/scenarios/octavia.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible Octavia scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-octavia:
+        - kolla-ansible-debian-trixie-octavia:
             files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/
         - kolla-ansible-ubuntu-noble-octavia:
             files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/

zuul.d/scenarios/ovn.yaml

@@ -5,7 +5,7 @@
       Runs Kolla-Ansible OVN scenario jobs on particular Kolla changes.
     check:
       jobs:
-        - kolla-ansible-debian-bookworm-ovn:
+        - kolla-ansible-debian-trixie-ovn:
             files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
         - kolla-ansible-rocky-10-ovn:
             files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/

zuul.d/scenarios/telemetry.yaml

@@ -0,0 +1,13 @@
+---
+- project-template:
+    name: kolla-scenario-telemetry
+    description: |
+      Runs Kolla-Ansible Telemetry scenario jobs on particular Kolla changes.
+    check:
+      jobs:
+        - kolla-ansible-debian-trixie-telemetry:
+            files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
+        - kolla-ansible-rocky-10-telemetry:
+            files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*
+        - kolla-ansible-ubuntu-noble-telemetry:
+            files: ^docker\/(base|aodh|ceilometer|gnocchi|valkey|openstack-base)\/.*