Skip to content

Commit 71233cd

Browse files
bbezakbbezak
committed
rocky/aarch64: switch to versioned Erlang 26/27 repos
Replace unversioned aarch64 Erlang COPR with erlang-26 and erlang-27 Aligns with Kolla change [1]. [1] https://review.opendev.org/c/openstack/kolla/+/959323 Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
1 parent f298b00 commit 71233cd

File tree

10 files changed

+49
-6
lines changed

10 files changed

+49
-6
lines changed

‎etc/kayobe/environments/ci-aio/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
2424
# Build against released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
2626
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
28+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
2729
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2830
stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
2931
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

‎etc/kayobe/environments/ci-builder/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ stackhpc_repo_mirror_password: !vault |
4949
# Build against released Pulp repository versions.
5050
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
5151
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
52+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
53+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
5254
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
5355
stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
5456
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

‎etc/kayobe/environments/ci-multinode/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
2424
# Build and deploy released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
2626
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
28+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
2729
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2830
stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
2931
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ kolla_image_tags:
99
keystone:
1010
rocky-9: 2025.1-rocky-9-20250805T134044
1111
ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044
12+
kolla-toolbox:
13+
rocky-9: 2025.1-rocky-9-20250905T134713
14+
ubuntu-noble: 2025.1-ubuntu-noble-20250905T134713
1215
magnum:
1316
rocky-9: 2025.1-rocky-9-20250811T111154
1417
ubuntu-noble: 2025.1-ubuntu-noble-20250811T111154
1518
prometheus_libvirt_exporter:
1619
rocky-9: 2025.1-rocky-9-20250822T151934
1720
ubuntu-noble: 2025.1-ubuntu-noble-20250822T151934
21+
rabbitmq:
22+
rocky-9: 2025.1-rocky-9-20250905T134713
23+
ubuntu-noble: 2025.1-ubuntu-noble-20250905T134713

‎etc/kayobe/kolla.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,14 @@ stackhpc_rocky_9_third_party_repos:
203203
file: "CentOS-Ceph-Squid.repo"
204204
tag: "centos-ceph-squid"
205205
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
206-
file: "{{ 'copr-rabbitmq-erlang.repo' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang.repo' }}"
207-
tag: "{{ 'copr-rabbitmq-erlang' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang' }}"
206+
file: "rabbitmq_rabbitmq-erlang.repo"
207+
tag: "rabbitmq_rabbitmq-erlang"
208+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_url }}"
209+
file: "copr-rabbitmq-erlang-26.repo"
210+
tag: "copr-rabbitmq-erlang-26"
211+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_url }}"
212+
file: "copr-rabbitmq-erlang-27.repo"
213+
tag: "copr-rabbitmq-erlang-27"
208214
- url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
209215
file: "rabbitmq_rabbitmq-server.repo"
210216
tag: "rabbitmq_rabbitmq-server"
@@ -286,11 +292,12 @@ kolla_build_blocks:
286292
tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
287293
{% endif %}
288294
{% for repo in base_centos_repo_overrides_post_yum_list %}
295+
if [ -f /etc/yum.repos.d/{{ repo.file }} ]; then \
289296
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
290297
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
291298
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
292299
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
293-
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
300+
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}; fi{% if not loop.last %} &&{% endif %} \
294301
{% endfor %}
295302
# NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
296303
# (see rdo-openvswitch.spec obsolete_ovn_versions:

‎etc/kayobe/pulp-repo-versions.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ stackhpc_pulp_repo_grafana_version: 20250615T005738
2727
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
2828
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
2929
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
30-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
30+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20250905T114106
31+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20250905T114106
3132
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
3233
stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704
3334
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20250529T041909

‎etc/kayobe/pulp.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,10 @@ stackhpc_pulp_repo_rocky_9_crb_version: "{{ lookup('vars', 'stackhpc_pulp_repo_r
216216
stackhpc_pulp_repo_rocky_9_highavailability_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_highavailability' ~ arch_suffix ~ '_version') }}"
217217

218218
# Rocky 9 Multiarch repositories
219-
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version') }}"
219+
#NOTE(bbezak): Versioned Erlang repos (aarch64 only). Fallback to generic Erlang version if not defined.
220+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version) }}"
221+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version) }}"
222+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version) }}"
220223
stackhpc_pulp_repo_multiarch_centos_stream_9_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
221224
stackhpc_pulp_repo_multiarch_centos_stream_9_openstack_epoxy_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_openstack_epoxy' ~ arch_suffix ~ '_version') }}"
222225
stackhpc_pulp_repo_multiarch_centos_stream_9_opstools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_opstools' ~ arch_suffix ~ '_version') }}"

‎etc/kayobe/stackhpc.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
6363
# RabbitMQ - Erlang for RHEL 9
6464
stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
6565
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
66+
# RabbitMQ - Erlang 26 for RHEL 9 (aarch64)
67+
stackhpc_repo_rhel9_rabbitmq_erlang_26_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang-26/el/9/aarch64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_version }}"
68+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_repo_distribution }}"
69+
70+
# RabbitMQ - Erlang 27 for RHEL 9 (aarch64)
71+
stackhpc_repo_rhel9_rabbitmq_erlang_27_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang-27/el/9/aarch64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_version }}"
72+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_repo_distribution }}"
6673

6774
# RabbitMQ for RHEL 9
6875
stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
@@ -149,7 +156,7 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
149156

150157
# Kolla source repository.
151158
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
152-
stackhpc_kolla_source_version: stackhpc/20.1.0.10
159+
stackhpc_kolla_source_version: stackhpc/20.1.0.11
153160

154161
# Kolla Ansible source repository.
155162
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

‎releasenotes/notes/erlang-aarch64-repo-change-a77c49c408413857.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
upgrade:
3+
- |
4+
Switch aarch64 Erlang RPMs to versioned erlang-26 and erlang-27 COPR
5+
repositories to support RabbitMQ 4.0/4.1 and align with Kolla [1].
6+
x86_64 remains unchanged.
7+
[1] https://review.opendev.org/c/openstack/kolla/+/959323

‎releasenotes/notes/ubuntu-noble-erlang-fix-5c2ed340ac6c5e74.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Ubuntu Noble rabbitmq image rebuild with correct Erlang PPA suite for
5+
Erlang 26/27 from "jammy" to "noble". Followed upstream [1].
6+
[1] https://review.opendev.org/c/openstack/kolla/+/959426

0 commit comments

Comments
 (0)