From 0ec6049a73ef7e322c06ee0e7b8582e5e69b8815 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 29 Apr 2021 11:12:21 +0200
Subject: [PATCH] CentOS on AArch64 has only Erlang 22

RabbitMQ 3.8.14 is the last version with Erlang 22 support

Change-Id: I1d68a47f78b925af76c44c61af7da1465371e721
---
 docker/kolla-toolbox/Dockerfile.j2 | 15 +++++++++++++--
 docker/rabbitmq/Dockerfile.j2      | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 7b018880d3..0bea39be47 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -17,9 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['rabbitmq', 'erlang', 'openvswitch', 'powertools']) }}
 
 {% if base_package_type == 'rpm' %}
+
     {% set kolla_toolbox_packages = [
         'crudini',
-        'erlang-23.*',
         'gcc',
         'gdisk',
         'git',
@@ -34,9 +34,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openssl-devel',
         'openvswitch',
         'python3-devel',
-        'rabbitmq-server-3.8.*'
         ] %}
 
+    {% if base_arch == 'aarch64' %}
+        {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+            'erlang-22.*',
+            'rabbitmq-server-3.8.14'
+            ] %}
+    {% else %}
+        {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+            'erlang-23.*',
+            'rabbitmq-server-3.8.*'
+            ] %}
+    {% endif %}
+
 {% elif base_package_type == 'deb' %}
     {% set kolla_toolbox_packages = [
         'build-essential',
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index e30de3734e..86fd73ec61 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -15,10 +15,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_package_type == 'rpm' %}
     {% set rabbitmq_packages = [
         'hostname',
-        'erlang-23.*',
         'rabbitmq-server-3.8.*'
     ] %}
 
+    {% if base_arch == 'aarch64' %}
+        {% set rabbitmq_packages = rabbitmq_packages + [
+            'erlang-22.*',
+            'rabbitmq-server-3.8.14'
+            ] %}
+    {% else %}
+        {% set rabbitmq_packages = rabbitmq_packages + [
+            'erlang-23.*',
+            'rabbitmq-server-3.8.*'
+            ] %}
+    {% endif %}
+
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [
         'logrotate',