Use el/9 repo urls instead of el/8 since a repo is available for it

As we target el9 and not el8, we should use the el/9 repo as it is
available, even though it provides RPMs with an `el8` dist tag. This can
help prevent confusion for users who see a repo on the system configured
with `el/8` in the repourl.

There should be no impact on existing installations, as the same repo
content is provided in both repos in almost all cases--namely, a few
early versions of erlang are unavailable, but as we pin to a version
that exists in both repos, there is no impact to this change: at worst,
the erlang package will be upgraded to a newer minor version if a user
somehow has an older one installed.

Change-Id: I70c13f7f882ce8666b12314a31f76fe63599677c
This commit is contained in:
Neil Hanlon 2023-05-30 11:50:36 -04:00
parent 3ee66ae7af
commit efd5ba9be7
No known key found for this signature in database
GPG Key ID: 705BC21EC3C70F34

View File

@ -15,18 +15,15 @@
_rabbitmq_install_method: external_repo
_rabbitmq_package_version: 3.11.17-1
# NOTE(nhanlon) 2023-05-30: although the package repository is marked
# el9, the packages themselves still have an el8 dist tag for rabbitmq
_rabbitmq_package_dist_tag: "el8"
_erlang_package_version: 25.3.2-1
_erlang_package_dist_tag: "el{{ ansible_facts['distribution_major_version'] }}"
# NOTE(jrosser): Before updating the distribution release from '8' or using ansible_distribution_release, check
# the rabbitmq install docs (https://www.rabbitmq.com/install-rpm.html#package-cloud) which say:
#
# The following example sets up a repository that will install RabbitMQ and its Erlang
# dependency from Cloudsmith, and targets CentOS Stream 8. The same repository definition
# can be used by recent Fedora releases and CentOS Stream 9.
# NOTE(noonedeadpunk): List of available packages can be searched here: https://packagecloud.io/rabbitmq/rabbitmq-server
_rabbitmq_repo_url: "https://yum1.novemberain.com/rabbitmq/el/8/noarch"
# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
_rabbitmq_repo_url: "https://yum1.novemberain.com/rabbitmq/el/{{ ansible_facts['distribution_major_version'] | lower }}/noarch"
_rabbitmq_repo:
name: rabbitmq_rabbitmq-server
description: "RabbitMQ Server Rolling Repository"
@ -38,7 +35,7 @@ _rabbitmq_repo:
- https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key
# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
_rabbitmq_erlang_repo_url: "https://yum1.novemberain.com/erlang/el/8/$basearch"
_rabbitmq_erlang_repo_url: "https://yum1.novemberain.com/erlang/el/{{ ansible_facts['distribution_major_version'] | lower }}/$basearch"
_rabbitmq_erlang_repo:
name: rabbitmq_els-erlang
description: "RabbitMQ Erlang Packages"
@ -51,5 +48,5 @@ _rabbitmq_erlang_repo:
rabbitmq_distro_packages:
- openssl
- "erlang-{{ _erlang_package_version }}.el8.{{ ansible_facts['architecture'] }}"
- "rabbitmq-server-{{ rabbitmq_package_version }}.el8.noarch"
- "erlang-{{ _erlang_package_version }}.{{ _erlang_package_dist_tag }}.{{ ansible_facts['architecture'] }}"
- "rabbitmq-server-{{ rabbitmq_package_version }}.{{ _rabbitmq_package_dist_tag }}.noarch"