File tree Expand file tree Collapse file tree 3 files changed +22
-0
lines changed Expand file tree Collapse file tree 3 files changed +22
-0
lines changed Original file line number Diff line number Diff line change @@ -61,8 +61,14 @@ kolla_image_tags:
6161 rocky-9 : 2025.1-rocky-9-20251031T094539
6262 ubuntu-noble : 2025.1-ubuntu-noble-20251031T094539
6363 kolla_toolbox :
64+ <<<<<<< HEAD
6465 rocky-9 : 2025.1-rocky-9-20250905T151507
6566 ubuntu-noble : 2025.1-ubuntu-noble-20250905T151507
67+ =======
68+ rocky-9 : 2024.1-rocky-9-20250908T155427
69+ ubuntu-jammy : 2024.1-ubuntu-jammy-20250529T081147
70+ ubuntu-noble : 2024.1-ubuntu-noble-20250529T081147
71+ >>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
6672 magnum :
6773 rocky-9 : 2025.1-rocky-9-20251016T073648
6874 ubuntu-noble : 2025.1-ubuntu-noble-20251016T073648
@@ -72,5 +78,11 @@ kolla_image_tags:
7278 rocky-9 : 2025.1-rocky-9-20250822T151934
7379 ubuntu-noble : 2025.1-ubuntu-noble-20250822T151934
7480 rabbitmq :
81+ <<<<<<< HEAD
7582 rocky-9 : 2025.1-rocky-9-20250905T151507
7683 ubuntu-noble : 2025.1-ubuntu-noble-20250905T151507
84+ =======
85+ rocky-9 : 2024.1-rocky-9-20250908T155427
86+ ubuntu-jammy : 2024.1-ubuntu-jammy-20250722T083943
87+ ubuntu-noble : 2024.1-ubuntu-noble-20250722T083943
88+ >>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
Original file line number Diff line number Diff line change @@ -172,13 +172,17 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
172172stackhpc_kolla_source_url : " https://github.com/stackhpc/kolla"
173173<<<<<<< HEAD
174174<<<<<<< HEAD
175+ <<<<<<< HEAD
175176stackhpc_kolla_source_version : stackhpc/20.2.0.4
176177=======
177178stackhpc_kolla_source_version : stackhpc/18.7.0.11
178179>>>>>>> 512f5389 (Bump kolla to stackhpc/18.7.0.11)
179180=======
180181stackhpc_kolla_source_version : stackhpc/18.7.0.12
181182>>>>>>> 4877398f (Bump kolla to stackhpc/18.7.0.12)
183+ =======
184+ stackhpc_kolla_source_version : stackhpc/18.7.0.13
185+ >>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
182186
183187# Kolla Ansible source repository.
184188stackhpc_kolla_ansible_source_url : " https://github.com/stackhpc/kolla-ansible"
Original file line number Diff line number Diff line change 22fixes :
33 - |
44 Switch aarch64 Erlang RPMs to versioned erlang-26 and erlang-27 COPR
5+ <<<<<<< HEAD
56 repositories to support RabbitMQ 4.0/4.1 and align with Kolla [1].
67 x86_64 remains unchanged.
78 [1] https://review.opendev.org/c/openstack/kolla/+/959323
9+ =======
10+ repositories to support RabbitMQ 3.13/4.1 and align with Kolla [1].
11+ x86_64 remains unchanged.
12+ [1] https://review.opendev.org/c/openstack/kolla/+/959692
13+ >>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
You can’t perform that action at this time.
0 commit comments