Merge "erlang: use packages from Erlang Solutions on AArch64" into stable/xena

Author: Zuul

docker/base/Dockerfile.j2

@@ -97,6 +97,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = [
         'elasticsearch.repo',
+        'erlang-solutions.repo',
         'grafana.repo',
         'mariadb-aarch64.repo',
         'proxysql.repo',
@@ -105,6 +106,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
     ] %}
 
     {% set base_yum_repo_keys = [
+        'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
         'https://packages.grafana.com/gpg.key',
         'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
         'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',

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

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',
@@ -34,19 +39,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 = [

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',

kolla/template/repos.yaml

@@ -26,7 +26,7 @@ centos-aarch64:
   elasticsearch: "elasticsearch-kibana-logstash-7.x"
   epel: "epel"
   epel-modular: "epel-modular"
-  erlang: "centos-rabbitmq-38"
+  erlang: "erlang-solutions"
   extras: "extras"
   grafana: "grafana"
   hacluster: "ha"