openstack/kolla
Code Issues Proposed changes

erlang: use packages from Erlang Solutions on AArch64

Browse Source 
RabbitMQ requires Erlang 23+ and soon will bump to 24+.

On AArch64 we used version 22 as there was no other option. Now it is.

Change-Id: I667ccda5bb4edbfbfb97dfb0cea264837ed05cae
This commit is contained in:
Marcin Juszkiewicz 2022-02-03 14:14:27 +01:00
parent 405fca90f2
commit f943c7d773
5 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -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',
] %}

6
docker/base/erlang-solutions.repo Normal file
View File

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

22
docker/kolla-toolbox/Dockerfile.j2
View File

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

21
docker/rabbitmq/Dockerfile.j2
View File

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

2
kolla/template/repos.yaml
View File

@ -25,7 +25,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"