From bf53f24dd40b9938ba3d10ba35cc87489d285980 Mon Sep 17 00:00:00 2001 From: Andrew Bonney Date: Fri, 6 Aug 2021 09:54:09 +0100 Subject: [PATCH] Fix erlang upgrades for rabbitmq external_repo installs Upgrading only the 'erlang' package does not pull in updated dependencies which can cause rabbitmq to fail to start during an upgrade. The external and distro dependencies appear to match, so these are conformed to ensure that all packages are updated during an upgrade. This patch additionally switches deployments to the 'erlang-base' rather than 'erlang-base-hipe' package which appears to have been discontinued. Change-Id: I8bd010cba13946c9c46c3792624841e41e3c2eaf --- vars/debian-11.yml | 2 +- vars/debian.yml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/vars/debian-11.yml b/vars/debian-11.yml index 37a54f4e..b3ef71b9 100644 --- a/vars/debian-11.yml +++ b/vars/debian-11.yml @@ -21,7 +21,7 @@ _rabbitmq_erlang_version_spec: "23.2.6+dfsg-1" _rabbitmq_gpg_keys: [] rabbitmq_dependencies: - - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}" + - erlang-base - erlang-diameter - erlang-eldap - erlang-nox diff --git a/vars/debian.yml b/vars/debian.yml index 99e8d0a6..f3d8f794 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -34,17 +34,12 @@ _rabbitmq_erlang_repo: _rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:23.2.3-1', '1:22.*') }}" -_rabbitmq_distro_dependencies: - - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}" +rabbitmq_dependencies: + - erlang-base - erlang-diameter - erlang-eldap - erlang-nox - socat -_rabbitmq_external_dependencies: - - erlang - -rabbitmq_dependencies: "{{ (rabbitmq_install_method == 'external_repo') | ternary(_rabbitmq_external_dependencies, _rabbitmq_distro_dependencies) }}" - rabbitmq_distro_packages: - rabbitmq-server