Merge pull request #467 from stackhpc/upstream/master-2025-09-08

Synchronise master with upstream

Author: priteau

.zuul.d/base.yaml

@@ -43,6 +43,31 @@
           7xlK/HOqvgMubcqzR33mRoSnkcnFpD50O9k41ZsF9SPKHMGmk9LyI05vkL6bcc3ypLBQY
           BTdg70hF/5m6rHFbVCsNDPlVykcEzsW6D4qqxh/5b3LHbPYbe7ciXcc+PTnYb8=
 
+- secret:
+    name: kolla_copr_webhooks
+    data:
+      urls: !encrypted/pkcs1-oaep
+        - IOTnCYHKs2AOvo5eRCUyy2e7mmo4zzPsTjcYJUlX1g+S93hXxqq3jS/EXJUE57TOJePeS
+          saLbrFZyBScL9oYZaXiXPDiGMUHH09AdcdKJ18KhYGnYPx9j5o7ya0HBfbVD736JQrLGV
+          oa08Rav+27I9guYu2V3B9CH+BQId0iujceeoVd0keUHoZFkTBrdX4rjQ6QlpcCn2KFcMG
+          EAeVM6SFXU8KSm5b7/T7cKJmyuQk3uAD0R/RaY4L4GLKdZMgG2rf0AA/sOAbZgIf/nqem
+          vwyJRM342fVKDozOivDMNcqMVjKtOwr/+CL3M2cTktxYq/WOVTxY72c/mjt2AE9lbDNu3
+          zMMz+95fdkMUdlowC0ODcGL6M4DOlsrZpiUO9iaIqBpl9iJtZsAVB3/Zbb0LBJ3+o3Sp5
+          rcYMwhICSITXECvERz9R63MGvtf3DaucKkJRtTri6Utwc9ZCCU0ZsW9jzJZ1roqMjzWEJ
+          oWg4uIrlzE7T96I8zly/nyYJJEYIE5/qmzg03cVTGRkq803PclDWuGJt9isUVqnTj07XZ
+          d06KIU2FmRPuC4L4XmHU5wMmE/XwqO6LkTlFhXJCnhpQTp9kcRIt680+3DWwSHQsL47Ld
+          o2tX1XeVm2m7IK3Xy8I6TwIpSJ8B43afKBFRg1w79yXrHSOMNj6fuNJ+WU/Us8=
+        - HIkK4PWDXI7VFNVm+/+qKmfEze/02zNi77wUH5sJLbShN1JVwLoJDdXNN9wmcIWWFDMkh
+          On4sMuW9OLZvaNl23/Hs9SPHfGJDalgT4UBxqO15JUiojptZwxTzT+A654D5szsEU3LHU
+          zNe/Ly0AW0WmjjDkP3waCyBk5WfR3LfTSTlVw3yK6t71V/XbYJIm9m+c47dgBWMuL4Voj
+          xOMTBYXyUQYpdB744Hc3F4ensoE9SHlSIpgmmaiWW+DMHRz4Diz1Kppb67ts34kVRyf/B
+          EVlEjxr7IBR5+ZpuCPNSDJALkl/nw4tXoaw0u+VazgBOYJsdQq2OJFXhiGNFAeO8p3Kqw
+          ALkf8du+CXAeBBumODBToZRPb9vARlPVind/svJXdDwZfSixfCHvRQ9gEagNzYYo/CjFV
+          JBZpzG1NX/C5WNtvrltemaeyL120x6VnXvz7oL4v8lgIlGM4MSg8miKvgCl/IXBLqoKq1
+          0mRmqVQVjaIhLpc9UzzB3MByQzlErmYXNjzrZRICzmiQocLCTjKebzUn4dhYQ1SIjufjV
+          Xe09WORotwmRLkhr76gZqpYOaTyWDjYZUwcMigQMj+iNQQmUPCqasUkVai5VLH7A2cX8V
+          IKnI6zygwIHXLVrmtUGh5V8eXPXw4RdhILS7vSw65jk4qjJwniNcd5kXzMINRA=
+
 - nodeset:
     name: kolla-centos-9-stream
     nodes:

.zuul.d/ubuntu.yaml

@@ -31,8 +31,6 @@
             files: ^docker/proxysql/
         - kolla-ansible-ubuntu-bifrost:
             files: ^docker/bifrost/
-        - kolla-ansible-ubuntu-zun:
-            files: ^docker/|zun/
     check-arm64:
       jobs:
         - kolla-build-ubuntu-aarch64
@@ -45,6 +43,9 @@
     periodic:
       jobs:
         - kolla-publish-ubuntu-quay
+    periodic-weekly:
+      jobs:
+        - kolla-copr-erlang-update
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-ubuntu
@@ -91,3 +92,12 @@
     nodeset: kolla-ubuntu-noble
     vars:
       base_distro: ubuntu
+
+- job:
+    name: kolla-copr-erlang-update
+    parent: base
+    nodeset: kolla-ubuntu-noble
+    timeout: 3600
+    run: tests/playbooks/copr-erlang-update.yml
+    secrets:
+      - kolla_copr_webhooks

doc/source/contributor/contributing.rst

@@ -26,7 +26,8 @@ Communication
 IRC Channel
     ``#openstack-kolla`` (`channel logs`_) on `OFTC <http://oftc.net>`_
 
-`Weekly Meetings <https://meetings.opendev.org/#Kolla_Team_Meeting>`_
+Weekly Meetings
+    In the IRC channel (`meeting information`_)
 
 Mailing list (prefix subjects with ``[kolla]``)
     https://lists.openstack.org/pipermail/openstack-discuss/
@@ -40,7 +41,7 @@ Whiteboard (etherpad)
     https://etherpad.openstack.org/p/KollaWhiteBoard
 
 .. _channel logs: https://meetings.opendev.org/irclogs/%23openstack-kolla/
-.. _meetings logs:  https://meetings.opendev.org/meetings/kolla/
+.. _meeting information: https://meetings.opendev.org/#Kolla_Team_Meeting
 
 Contacting the Core Team
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -49,8 +50,8 @@ In general it is suggested to use the above mentioned public communication
 channels, but if you find that you need to contact someone from the Core team
 directly, you can find the lists in Gerrit:
 
-- kolla-core https://review.opendev.org/admin/groups/28d5dccfccc125b3963f76ab67e256501565d52b,members
-- kayobe-core https://review.opendev.org/admin/groups/361e28280e3a06be2997a5aa47a8a11d3a8fb9b9,members
+- `Kolla core team <https://review.opendev.org/admin/groups/kolla-core,members>`__
+- `Kayobe core team <https://review.opendev.org/admin/groups/kayobe-core,members>`__
 
 New Feature Planning
 ~~~~~~~~~~~~~~~~~~~~
@@ -61,20 +62,30 @@ prefix).
 Task Tracking
 ~~~~~~~~~~~~~
 
-Kolla project tracks tasks in `Launchpad <https://bugs.launchpad.net/kolla>`__.
-Note this is the same place as for bugs.
+Kolla family projects track tasks and bugs in Launchpad:
+
+- `Kolla <https://bugs.launchpad.net/kolla>`__
+- `Kolla Ansible <https://bugs.launchpad.net/kolla-ansible>`__
+- `Ansible Collection Kolla <https://bugs.launchpad.net/ansible-collection-kolla>`__
+- `Kayobe <https://bugs.launchpad.net/kayobe>`__
 
 If you're looking for some smaller, easier work item to pick up and get started
-on, search for the 'low-hanging-fruit' tag.
+on, search for the 'low-hanging-fruit' tag in the relevant project.
 
 A more lightweight task tracking is done via etherpad - `Whiteboard <https://etherpad.openstack.org/p/KollaWhiteBoard>`__.
 
 Reporting a Bug
 ~~~~~~~~~~~~~~~
 
-You found an issue and want to make sure we are aware of it? You can do so
-on `Launchpad <https://bugs.launchpad.net/kolla>`__.
-Note this is the same place as for tasks.
+You found an issue and want to make sure we are aware of it?
+Please report it in the appropriate Launchpad project:
+
+- `Kolla <https://bugs.launchpad.net/kolla>`__
+- `Kolla Ansible <https://bugs.launchpad.net/kolla-ansible>`__
+- `Ansible Collection Kolla <https://bugs.launchpad.net/ansible-collection-kolla>`__
+- `Kayobe <https://bugs.launchpad.net/kayobe>`__
+
+Note these are also used for task tracking.
 
 Getting Your Patch Merged
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,6 +97,22 @@ is described in :ref:`its own section <release-notes>`.
 
 Significant changes should have documentation and testing provided with them.
 
+To see an overview of in-progress patches, sorted into useful sections, you can
+view the:
+
+- `Kolla Review Dashboard <https://review.opendev.org/dashboard/?title=Kolla+Review+Dashboard&foreach=project%3Aopenstack%2Fkolla+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__
+
+- `Kolla Ansible Review Dashboard <https://review.opendev.org/dashboard/?title=Kolla%2DAnsible+Review+Dashboard&foreach=project%3Aopenstack%2Fkolla%2Dansible+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__
+
+- `Ansible Collection Kolla Review Dashboard <https://review.opendev.org/dashboard/?title=ansible%2Dcollection%2Dkolla+Review+Dashboard&foreach=project%3Aopenstack%2Fansible%2Dcollection%2Dkolla+status%3Aopen+NOT+label%3AWorkflow%3C%3D%2D1+NOT+label%3ACode%2DReview%3C%3D%2D2&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__
+
+- `Kayobe Review Dashboard <https://review.opendev.org/dashboard/?title=Kayobe+Review+Dashboard&foreach=%28project%3Aopenstack%2Fkayobe+OR+project%3Aopenstack%2Fkayobe%2Dconfig+OR+project%3Aopenstack%2Fkayobe%2Dconfig%2Ddev%29+status%3Aopen+NOT+label%3ACode%2DReview%3C%3D%2D2+NOT+label%3AWorkflow%3C%3D%2D1&High+priority+changes=label%3AReview%2DPriority%3D2&Priority+changes=label%3AReview%2DPriority%3D1&Feature+freeze=label%3AReview%2DPriority%3D%2D1&Stable+branch+backports=branch%3A%5Estable%2F.%2A+status%3Aopen+NOT+label%3AReview%2DPriority%3D%2D1&Small+things+%28%3C25+LOC%2C+limit+25%29+on+master+branch=delta%3A%3C%3D25+limit%3A25+NOT+label%3ACode%2DReview%2D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+Final+Approval+%28to+land+on+master+branch%29=NOT+label%3AWorkflow%3E%3D1+NOT+label%3AWorkflow%3C%3D%2D1+NOT+owner%3Aself+label%3ACode%2DReview%3E%3D2+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Needs+revisit+%28You+were+a+reviewer+but+haven%27t+voted+in+the+current+revision%29=reviewer%3Aself+limit%3A50&Newer+%28%3C1wk%29+Open+Patches+%28limit+25%29+on+master+branch=%2Dage%3A1week+limit%3A25+NOT+label%3AWorkflow%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3ACode%2DReview%3E%3D2+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster&Older+%28%3E1wk%29+Open+Patches+Passing+Zuul+Tests+%28limit+50%29+on+master+branch=age%3A1week+limit%3A50+NOT+label%3AWorkflow%3E%3D1+NOT+label%3ACode%2DReview%3C%3D%2D1+NOT+label%3ACode%2DReview%3E%3D1+label%3AVerified%3E%3D1%2Czuul+NOT+label%3AReview%2DPriority%3D%2D1+branch%3Amaster>`__
+
+.. note::
+
+   If you feel that your change is getting overlooked, reach out via
+   :ref:`preferred communication methods <communication>` to let us know.
+
 Project Team Lead Duties
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

doc/source/contributor/versions.rst

@@ -47,7 +47,7 @@ information about package sources.
 .. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
 .. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
 .. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
-.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/
+.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang-27/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
 .. _`MariaDB Community downloads`: https://mariadb.com/downloads/community/

docker/base/copr-rabbitmq-erlang.repo

@@ -4,8 +4,8 @@
 
 [copr-rabbitmq-erlang]
 name=openstack-kolla COPR with Erlang build for RabbitMQ
-baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/rhel-$releasever-aarch64/
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/
 gpgcheck=1
 enabled=0
-gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/pubkey.gpg
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg
 repo_gpgcheck=0

releasenotes/notes/erlang-aarch64-repo-change-7fbc8696990b5677.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Switches Erlang RPMs on aarch64 to a versioned Erlang 27 repository,
+    due to Fedora COPR not supporting multiple package versions in one repo.

tests/playbooks/copr-erlang-update.yml

@@ -0,0 +1,18 @@
+---
+- name: COPR Erlang update
+  hosts: all
+  tasks:
+    - name: Ensure webhook URLs are defined
+      no_log: true
+      ansible.builtin.assert:
+        that:
+          - kolla_copr_webhooks.urls is defined
+          - kolla_copr_webhooks.urls | length > 0
+        fail_msg: "Missing Zuul secret 'kolla_copr_webhooks.urls' (list of webhook URLs)."
+
+    - name: Trigger COPR builds via webhooks
+      no_log: true
+      ansible.builtin.uri:
+        url: "{{ item }}"
+        method: POST
+      loop: "{{ kolla_copr_webhooks.urls }}"