openstack
/
kolla
Code Issues Proposed changes

Merge "rabbitmq: use Erlang 25 on AArch64/CentOS/Rocky"

This commit is contained in:
Zuul 2022-10-27 15:09:55 +00:00 committed by Gerrit Code Review
parent 1da94b16f0 3c70d5fc4e
commit 8fe9440f95
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,19 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{# NOTE(hrw): we do not have Erlang 25 packages for AArch64 yet. #}
{% if base_arch == 'aarch64' %}
{% set kolla_toolbox_packages = [
'erlang-24.*',
] %}
{% else %}
{% set kolla_toolbox_packages = [
'erlang-25.*',
] %}
{% endif %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
{% set kolla_toolbox_packages = [
'crudini',
'erlang-25.*',
'gcc',
'gdisk',
'git',

8
docker/rabbitmq/Dockerfile.j2
View File

@ -14,18 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install %}
{% if base_package_type == 'rpm' %}
{# NOTE(hrw): we do not have Erlang 25 packages for AArch64 yet. #}
{% if base_arch == 'aarch64' %}
{% set rabbitmq_packages = [
'erlang-24.*',
'rabbitmq-server-3.10.*'
] %}
{% else %}
{% set rabbitmq_packages = [
'erlang-25.*',
'rabbitmq-server-3.10.*'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set rabbitmq_packages = [