From 4f51667e09c50685b14c25216d9f3caf217b67a9 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Tue, 17 Sep 2024 16:12:13 +0200 Subject: [PATCH 1/3] Add sed for multiline baseurl in yum repos --- etc/kayobe/kolla.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index e518d4065..122f9b6b1 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -251,6 +251,8 @@ kolla_build_blocks: mkdir -p /etc/yum.repos.d.backup && \ tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \ {% endif %} + echo "===== Before sed modifications I =====" && \ + cat /etc/yum.repos.d/*.repo && \ {% for repo in stackhpc_yum_repos %} sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \ @@ -258,6 +260,9 @@ kolla_build_blocks: -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} && \ {% endif %} {% endfor %} + && \ + echo "===== After sed modifications I =====" && \ + cat /etc/yum.repos.d/*.repo {% else %} RUN \ rm /etc/apt/sources.list && \ @@ -274,6 +279,8 @@ kolla_build_blocks: {# fixme #} {% if kolla_base_distro == 'rocky' %} && \ + echo "===== Before sed modifications II =====" && \ + cat /etc/yum.repos.d/*.repo && \ {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \ @@ -281,9 +288,13 @@ kolla_build_blocks: {% for repo in base_centos_repo_overrides_post_yum_list %} sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \ + -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} + && \ + echo "===== After sed modifications II =====" && \ + cat /etc/yum.repos.d/*.repo \ {% endif %} # With the UCA keyring installed we can now add all repos. base_ubuntu_package_sources_list: | From 39601264d4d779df78a101efc1ae15e90350db9d Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Wed, 25 Sep 2024 12:10:58 +0200 Subject: [PATCH 2/3] use new Rabbitmq Cloudsmith repos --- etc/kayobe/kolla.yml | 10 ---------- etc/kayobe/pulp-repo-versions.yml | 4 ++-- etc/kayobe/stackhpc.yml | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 122f9b6b1..009ee16ca 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -251,8 +251,6 @@ kolla_build_blocks: mkdir -p /etc/yum.repos.d.backup && \ tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \ {% endif %} - echo "===== Before sed modifications I =====" && \ - cat /etc/yum.repos.d/*.repo && \ {% for repo in stackhpc_yum_repos %} sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \ @@ -260,9 +258,6 @@ kolla_build_blocks: -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} && \ {% endif %} {% endfor %} - && \ - echo "===== After sed modifications I =====" && \ - cat /etc/yum.repos.d/*.repo {% else %} RUN \ rm /etc/apt/sources.list && \ @@ -279,8 +274,6 @@ kolla_build_blocks: {# fixme #} {% if kolla_base_distro == 'rocky' %} && \ - echo "===== Before sed modifications II =====" && \ - cat /etc/yum.repos.d/*.repo && \ {% if stackhpc_kolla_clean_up_repo_mirrors | bool %} tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \ tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \ @@ -292,9 +285,6 @@ kolla_build_blocks: -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \ -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} - && \ - echo "===== After sed modifications II =====" && \ - cat /etc/yum.repos.d/*.repo \ {% endif %} # With the UCA keyring installed we can now add all repos. base_ubuntu_package_sources_list: | diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 50985a30a..bd766b98c 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240708T235303 stackhpc_pulp_repo_grafana_version: 20240708T235303 stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343 -stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20240925T093206 +stackhpc_pulp_repo_rabbitmq_server_version: 20240925T111913 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233 stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522 stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 9606634a9..eac0853a7 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -61,7 +61,7 @@ stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}" # RabbitMQ for Redhat family, version 8/9 agnostic -stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}" +stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/noarch/{{ stackhpc_repo_rabbitmq_server_version }}" stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}" # CentOS Stream 9 - NFV OpenvSwitch From 3dd00cf7c1f5e7e276a565284a12e41e416bf7ab Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Wed, 25 Sep 2024 15:52:18 +0200 Subject: [PATCH 3/3] use rabbitmq built from Cloudsmith repo --- etc/kayobe/kolla-image-tags.yml | 2 +- etc/kayobe/stackhpc.yml | 4 ++-- .../notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 58d173a04..d0ac3c7e8 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -44,5 +44,5 @@ kolla_image_tags: ovn: rocky-9: 2023.1-rocky-9-20240809T102431 rabbitmq: - rocky-9: 2023.1-rocky-9-20240823T101942 + rocky-9: 2023.1-rocky-9-20240925T133913 ubuntu-jammy: 2023.1-ubuntu-jammy-20240823T101942 diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index eac0853a7..db9e3bda5 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -57,11 +57,11 @@ stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/ stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}" # RabbitMQ - Erlang for Redhat family, version 8/9 agnostic -stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}" +stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}" stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}" # RabbitMQ for Redhat family, version 8/9 agnostic -stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/noarch/{{ stackhpc_repo_rabbitmq_server_version }}" +stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rabbitmq_server_version }}" stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}" # CentOS Stream 9 - NFV OpenvSwitch diff --git a/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml new file mode 100644 index 000000000..b1a66e16f --- /dev/null +++ b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + RabbitMQ and Erlang packages are now all installed from the Cloudsmith + ``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting + shut down August 18st, 2024: + https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024