Skip to content

Commit 56f0ceb

Browse files
authored
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 81da2e7 commit 56f0ceb

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

etc/kayobe/kolla-image-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ kolla_image_tags:
4848
ovn:
4949
rocky-9: 2023.1-rocky-9-20240809T102431
5050
rabbitmq:
51-
rocky-9: 2023.1-rocky-9-20240823T101942
51+
rocky-9: 2023.1-rocky-9-20240925T133913
5252
ubuntu-jammy: 2023.1-ubuntu-jammy-20240823T101942

etc/kayobe/kolla.yml

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

etc/kayobe/pulp-repo-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240708T235303
1111
stackhpc_pulp_repo_grafana_version: 20240708T235303
1212
stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
1313
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
14-
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
15-
stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
14+
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240925T093206
15+
stackhpc_pulp_repo_rabbitmq_server_version: 20240925T111913
1616
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
1717
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
1818
stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511

etc/kayobe/stackhpc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/
5757
stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
5858

5959
# RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
60-
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
60+
stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
6161
stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6262

6363
# RabbitMQ for Redhat family, version 8/9 agnostic
64-
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
64+
stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rabbitmq_server_version }}"
6565
stackhpc_repo_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)