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

@@ -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

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