Skip to content

Commit 8378f5f

Browse files
committed
Fix rabbitmq builds after move to Cloudsmith mirror (#1301)
* Add sed for multiline baseurl in yum repos * use new Rabbitmq Cloudsmith repos * use rabbitmq built from Cloudsmith repo
1 parent 986657d commit 8378f5f

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

etc/kayobe/kolla.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ kolla_build_blocks:
280280
{% for repo in base_centos_repo_overrides_post_yum_list %}
281281
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
282282
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
283+
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
283284
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
284285
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
285286
{% endfor %}

etc/kayobe/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/co
6161
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6262

6363
# RabbitMQ for RHEL 9
64-
stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/x86_64/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
64+
stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
6565
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
6666

6767
# CentOS Stream 9 - NFV OpenvSwitch
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
upgrade:
3+
- |
4+
RabbitMQ and Erlang packages are now all installed from the Cloudsmith
5+
``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
6+
shut down August 18st, 2024:
7+
https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024

0 commit comments

Comments
 (0)