aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/base/Dockerfile.j27
-rw-r--r--docker/base/erlang-solutions.repo6
-rw-r--r--docker/base/hrw-copr-erlang-for-rabbitmq.repo11
-rw-r--r--kolla/template/repos.yaml4
4 files changed, 14 insertions, 14 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index d54a4680e..6629f676b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -98,11 +98,8 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management
# 'crmsh.repo',
{% elif base_arch == 'aarch64' %}
-{#
-Repo files not available for CentOS Stream 9:
- 'erlang-solutions.repo',
- #}
{% set base_yum_repo_files = base_yum_repo_files + [
+ 'hrw-copr-erlang-for-rabbitmq.repo',
] %}
{#
@@ -159,7 +156,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos-release-ceph-quincy',
'centos-release-nfv-openvswitch',
'centos-release-opstools',
- 'centos-release-rabbitmq-38',
'epel-release',
] %}
@@ -177,7 +173,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos-ceph-quincy',
'centos-nfv-openvswitch',
'centos-opstools',
- 'centos-rabbitmq-38',
'centos9-nfv-ovs',
'centos9-opstools',
'centos9-rabbitmq',
diff --git a/docker/base/erlang-solutions.repo b/docker/base/erlang-solutions.repo
deleted file mode 100644
index 4adbe680f..000000000
--- a/docker/base/erlang-solutions.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[erlang-solutions]
-name=erlang-solutions
-baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch
-gpgcheck=1
-gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc
-enabled=0
diff --git a/docker/base/hrw-copr-erlang-for-rabbitmq.repo b/docker/base/hrw-copr-erlang-for-rabbitmq.repo
new file mode 100644
index 000000000..d06e11464
--- /dev/null
+++ b/docker/base/hrw-copr-erlang-for-rabbitmq.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 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 b93612531..7f2c6ba8d 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -23,7 +23,7 @@ centos-aarch64:
crb: "crb"
elasticsearch: "elasticsearch-kibana-logstash-7.x"
epel: "epel"
- erlang: "centos-rabbitmq-38"
+ erlang: "copr-hrw-erlang-for-rabbitmq"
extras: "extras"
grafana: "grafana"
hacluster: "highavailability"
@@ -160,7 +160,7 @@ rocky-aarch64:
crb: "crb"
elasticsearch: "elasticsearch-kibana-logstash-7.x"
epel: "epel"
- erlang: "centos-rabbitmq-38"
+ erlang: "copr-hrw-erlang-for-rabbitmq"
extras: "extras"
grafana: "grafana"
influxdb: "influxdb"