Merge "erlang: use packages from Erlang Solutions on AArch64"

4 files changed, 24 insertions, 29 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 7867d6e11..43a7858e4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -99,10 +99,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
     ] %}
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = base_yum_repo_files + [
+        'erlang-solutions.repo',
         'mariadb-aarch64.repo',
     ] %}
 
     {% set base_yum_repo_keys = base_yum_repo_keys + [
+        'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
     ] %}
 {% endif %}
 
@@ -155,7 +157,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-release-nfv-extras',
     'centos-release-nfv-openvswitch',
     'centos-release-opstools',
-    'centos-release-rabbitmq-38',
     'epel-release',
 ] %}
 
@@ -176,7 +177,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-ceph-pacific',
     'centos-nfv-openvswitch',
     'centos-opstools',
-    'centos-rabbitmq-38',
     'epel',
     'epel-modular',
 ] %}
diff --git a/docker/base/erlang-solutions.repo b/docker/base/erlang-solutions.repo
new file mode 100644
index 000000000..4adbe680f
--- /dev/null
+++ b/docker/base/erlang-solutions.repo
@@ -0,0 +1,6 @@
+[erlang-solutions]
+name=erlang-solutions
+baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch
+gpgcheck=1
+gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc
+enabled=0
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 541e8d94f..c1d7779d6 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -14,12 +14,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ansible') }}
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['rabbitmq', 'erlang', 'openvswitch', 'powertools']) }}
+{% if base_arch == 'aarch64' %}
+{{ macros.enable_extra_repos(['epel']) }}
+{% endif %}
+
+{{ macros.enable_extra_repos(['erlang', 'openvswitch', 'powertools', 'rabbitmq']) }}
 
 {% if base_package_type == 'rpm' %}
 
     {% set kolla_toolbox_packages = [
         'crudini',
+        'erlang-23.*',
         'gcc',
         'gdisk',
         'git',
@@ -32,19 +37,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openssl-devel',
         'openvswitch',
         'python3-devel',
-        ] %}
-
-    {% 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 %}
+        'rabbitmq-server-3.8.*'
+    ] %}
 
 {% elif base_package_type == 'deb' %}
     {% set kolla_toolbox_packages = [
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 4a95a27b8..854f0d2f3 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -9,27 +9,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['rabbitmq', 'erlang', 'powertools']) }}
+{# NOTE(hrw): erlang packages from Erlang Solutions needs libwx from EPEL #}
+{% if base_arch == 'aarch64' %}
+{{ macros.enable_extra_repos(['epel']) }}
+{% endif %}
+
+{{ macros.enable_extra_repos(['erlang', 'powertools', 'rabbitmq']) }}
 
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
     {% set rabbitmq_packages = [
+        'erlang-23.*',
         'hostname',
+        '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',