Merge pull request #346 from stackhpc/upstream/2023.1-2024-09-16

Synchronise 2023.1 with upstream

Author: priteau

doc/source/contributor/versions.rst

@@ -23,14 +23,14 @@ information about package sources.
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  Opensearch     2.5.x              `Opensearch install guide`_
  ProxySQL       2.4.x              `ProxySQL repository`_
- Rabbitmq       3.10.x             - CentOS:
-                                     `Team RabbitMQ 'PackageCloud' repository`_
+ Rabbitmq       3.11.x             - CentOS/Rocky:
+                                     `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
-                                     `Team RabbitMQ 'Cloudsmith' repository`_
- Erlang         25.x               - CentOS aarch64:
+                                     `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
+ Erlang         25.X.X             - CentOS/Rocky aarch64:
                                      `Hrw's COPR`_
-                                   - CentOS x86-64:
-                                     `Team RabbitMQ 'PackageCloud' repository`_
+                                   - CentOS/Rocky x86-64:
+                                     `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Modern Erlang' PPA`_
  TD Agent       4.4.x              `TreasureData install guide`_
@@ -44,9 +44,9 @@ information about package sources.
 .. _`TreasureData install guide`: https://www.fluentd.org/download
 .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/
 
-.. _`Team RabbitMQ 'Cloudsmith' repository`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
+.. _`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 'PackageCloud' repository`: https://www.rabbitmq.com/install-rpm.html#package-cloud
+.. _`Team RabbitMQ 'Cloudsmith' repo (RPM)`: https://www.rabbitmq.com/docs/install-rpm#cloudsmith
 .. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss

docker/base/rabbitmq_rabbitmq-erlang.repo

@@ -1,7 +1,9 @@
 [rabbitmq_rabbitmq-erlang]
 name=rabbitmq_rabbitmq-erlang
-# https://www.rabbitmq.com/install-rpm.html lists "el/8" for CentOS Stream 9
-baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
+# Use a set of mirrors maintained by the RabbitMQ core team.
+# The mirrors have significantly higher bandwidth quotas.
+baseurl=https://yum1.rabbitmq.com/erlang/el/9/$basearch
+        https://yum2.rabbitmq.com/erlang/el/9/$basearch
 gpgcheck=1
 enabled=0
-gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
+gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key

docker/base/rabbitmq_rabbitmq-server.repo

@@ -1,6 +1,9 @@
 [rabbitmq_rabbitmq-server]
 name=rabbitmq_rabbitmq-server
-baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
+baseurl=https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
+        https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
 gpgcheck=1
 enabled=0
-gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
+# Cloudsmith's repository key and RabbitMQ package signing key
+gpgkey=https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
+       https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc

docker/kolla-toolbox/requirements.yml

@@ -1,7 +1,7 @@
 ---
 collections:
   - name: ansible.posix
-    version: '<2'
+    version: '<1.6.0'
   - name: community.general
     version: '<4'
   - name: community.mysql

kolla/template/repos.yaml

@@ -77,7 +77,7 @@ debian:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -129,7 +129,7 @@ debian-aarch64:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     arch: "amd64"
@@ -218,7 +218,7 @@ ubuntu:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -270,7 +270,7 @@ ubuntu-aarch64:
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu"
+    url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "jammy"
     component: "main"
     arch: "amd64"

kolla/tests/test_methods.py

@@ -86,7 +86,7 @@ def test_enable_repos_debian_arch(self):
         }
 
         result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable')
-        expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
+        expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -133,7 +133,7 @@ def test_enable_repos_debian_multiple(self):
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
 
         expectCmd += "echo 'Uris: "
-        expectCmd += "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
+        expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "

releasenotes/notes/bug-2080609-51f216ad1ba47d20.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes incompatibility between ``ansible.posix`` 1.6.0 and ``ansible-core``
+    versions below 2.15 by capping ``ansible.posix`` to 1.5.x.
+    `LP#2080609 <https://launchpad.net/bugs/2080609>`__

releasenotes/notes/rabbitmq-erlang-migrate-from-packagecloud-59d7e9e0a10e1da0.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now all installed from the Cloudsmith
+    ``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
+    shut down August 18st, 2024:
+    https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024