From b79a6c8bcf25af912620ffab9c98fbc2f775cfda Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 12 May 2022 14:27:40 +0100 Subject: [PATCH] Add support for centos-9 Change-Id: I5428a7d8ebb8e1cc108608bddb94784696dab098 --- vars/redhat.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/vars/redhat.yml b/vars/redhat.yml index fd250aa6..076664e0 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -19,7 +19,14 @@ _erlang_package_version: 24.3.3-1 # NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/ -_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/rpm/el/{{ ansible_facts['distribution_major_version'] }}/noarch" +# 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. + +_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/rpm/el/8/noarch" _rabbitmq_repo: name: rabbitmq_rabbitmq-server description: "RabbitMQ Server Rolling Repository" @@ -30,7 +37,7 @@ _rabbitmq_repo: - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc -_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/{{ ansible_facts['distribution_major_version'] }}/$basearch" +_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/8/$basearch" _rabbitmq_erlang_repo: name: rabbitmq_els-erlang description: "RabbitMQ Erlang Packages" @@ -43,5 +50,5 @@ _rabbitmq_erlang_repo: rabbitmq_distro_packages: - openssl - - "erlang-{{ _erlang_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.{{ ansible_facts['architecture'] }}" - - "rabbitmq-server-{{ rabbitmq_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.noarch" + - "erlang-{{ _erlang_package_version }}.el8.{{ ansible_facts['architecture'] }}" + - "rabbitmq-server-{{ rabbitmq_package_version }}.el8.noarch"