Skip to content

Commit 3960126

Browse files
committed
use new Rabbitmq Cloudsmith repos
1 parent 4f51667 commit 3960126

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

etc/kayobe/kolla.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,13 @@ kolla_build_blocks:
251251
mkdir -p /etc/yum.repos.d.backup && \
252252
tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
253253
{% endif %}
254-
echo "===== Before sed modifications I =====" && \
255-
cat /etc/yum.repos.d/*.repo && \
256254
{% for repo in stackhpc_yum_repos %}
257255
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
258256
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
259257
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
260258
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} && \
261259
{% endif %}
262260
{% endfor %}
263-
&& \
264-
echo "===== After sed modifications I =====" && \
265-
cat /etc/yum.repos.d/*.repo
266261
{% else %}
267262
RUN \
268263
rm /etc/apt/sources.list && \
@@ -279,8 +274,6 @@ kolla_build_blocks:
279274
{# fixme #}
280275
{% if kolla_base_distro == 'rocky' %}
281276
&& \
282-
echo "===== Before sed modifications II =====" && \
283-
cat /etc/yum.repos.d/*.repo && \
284277
{% if stackhpc_kolla_clean_up_repo_mirrors | bool %}
285278
tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \
286279
tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
@@ -292,9 +285,6 @@ kolla_build_blocks:
292285
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
293286
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
294287
{% endfor %}
295-
&& \
296-
echo "===== After sed modifications II =====" && \
297-
cat /etc/yum.repos.d/*.repo \
298288
{% endif %}
299289
# With the UCA keyring installed we can now add all repos.
300290
base_ubuntu_package_sources_list: |

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/
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/8/noarch/{{ stackhpc_repo_rabbitmq_server_version }}"
6565
stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
6666

6767
# CentOS Stream 9 - NFV OpenvSwitch

0 commit comments

Comments
 (0)