From 2480da6d987da338fa2688a31a33658da0abeb23 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 25 Sep 2024 11:59:30 +0200
Subject: [PATCH] erlang/aarch64: Move to openstack-kolla owned COPR

Change-Id: I219418411470bdeae9af84277f5150a623c05e69
---
 doc/source/contributor/versions.rst                |  4 ++--
 docker/base/Dockerfile.j2                          |  2 +-
 docker/base/copr-rabbitmq-erlang.repo              | 11 +++++++++++
 docker/base/hrw-copr-erlang-for-rabbitmq.repo      | 11 -----------
 kolla/template/repos.yaml                          |  4 ++--
 releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml |  6 ++++++
 6 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 docker/base/copr-rabbitmq-erlang.repo
 delete mode 100644 docker/base/hrw-copr-erlang-for-rabbitmq.repo
 create mode 100644 releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml

diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index 98767e20be..bbad1d00e2 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -28,7 +28,7 @@ information about package sources.
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
  Erlang         26.2.X             - CentOS/Rocky aarch64:
-                                     `Hrw's COPR`_
+                                     `openstack-kolla COPR`_
                                    - CentOS/Rocky x86-64:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
@@ -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
-.. _`Hrw's COPR`: https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/
+.. _`openstack-kolla COPR`: https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/
 
 .. _`Grafana install guide`: https://grafana.com/grafana/download?platform=linux&edition=oss
 .. _`MariaDB Community downloads`: https://mariadb.com/downloads/community/
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b3662f893a..38ad8e0444 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -75,7 +75,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
-        'hrw-copr-erlang-for-rabbitmq.repo',
+        'copr-rabbitmq-erlang.repo',
     ] %}
 
 {#
diff --git a/docker/base/copr-rabbitmq-erlang.repo b/docker/base/copr-rabbitmq-erlang.repo
new file mode 100644
index 0000000000..9b998eadc8
--- /dev/null
+++ b/docker/base/copr-rabbitmq-erlang.repo
@@ -0,0 +1,11 @@
+# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
+# from https://github.com/rabbitmq/erlang-rpm/
+# Thanks to COPR we have aarch64 packages for CentOS Stream 9
+
+[openstack-kolla-copr-rabbitmq-kolla]
+name=openstack-kolla COPR with Erlang build for RabbitMQ
+baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/centos-stream-$releasever-aarch64/
+gpgcheck=1
+enabled=0
+gpgkey=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/pubkey.gpg
+repo_gpgcheck=0
diff --git a/docker/base/hrw-copr-erlang-for-rabbitmq.repo b/docker/base/hrw-copr-erlang-for-rabbitmq.repo
deleted file mode 100644
index d06e114645..0000000000
--- a/docker/base/hrw-copr-erlang-for-rabbitmq.repo
+++ /dev/null
@@ -1,11 +0,0 @@
-# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
-# from https://github.com/rabbitmq/erlang-rpm/
-# Thanks to COPR we have aarch64 packages for CentOS Stream 8/9
-
-[copr-hrw-erlang-for-rabbitmq]
-name=Hrw's COPR with Erlang build for RabbitMQ
-baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
-gpgcheck=1
-enabled=0
-gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
-repo_gpgcheck=0
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 65cb7b745b..9c826a10c3 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -21,7 +21,7 @@ centos-aarch64:
   ceph: "centos-ceph-reef"
   crb: "crb"
   epel: "epel"
-  erlang: "copr-hrw-erlang-for-rabbitmq"
+  erlang: "copr-rabbitmq-erlang"
   extras: "extras"
   fluentd: "fluent-package-lts"
   grafana: "grafana"
@@ -157,7 +157,7 @@ rocky-aarch64:
   ceph: "centos-ceph-reef"
   crb: "crb"
   epel: "epel"
-  erlang: "copr-hrw-erlang-for-rabbitmq"
+  erlang: "copr-rabbitmq-erlang"
   extras: "extras"
   fluentd: "fluent-package-lts"
   grafana: "grafana"
diff --git a/releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml b/releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml
new file mode 100644
index 0000000000..69980c78da
--- /dev/null
+++ b/releasenotes/notes/copr-move-5d0464c50dc85ccf.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    ``Erlang`` RPMs on ``aarch64`` architecture are now installed from a new
+    location - `OpenStack Kolla's COPR <https://copr.fedorainfracloud.org/coprs/g/openstack-kolla/rabbitmq-erlang/>`_
+    compared to `Hrw's COPR <https://copr.fedorainfracloud.org/coprs/hrw/erlang-for-rabbitmq/>`_.