[yoga-only]: Fix erlang versions

According to [1] - RMQ 3.9 supports Erlang 25.2 at maximum.

Unfortunately there is no repository that provides erlang 25.2
for aarch64, so it will stay on 25.3 which proves to be bringing
some issues.

[1]: https://www.rabbitmq.com/which-erlang.html

Closes-Bug: #2025321

Change-Id: Ibfefccda9368ab46facf175024c03807d62ea1f7
This commit is contained in:
Michal Nasiadka 2023-10-04 18:52:02 +02:00
parent 06f9ddef87
commit 26de85f2f4
8 changed files with 81 additions and 6 deletions

View File

@ -325,7 +325,7 @@ RUN apt update \
{% endif %}
{% block base_ubuntu_package_apt_preferences %}
COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
COPY apt_preferences.{{ base_distro }}.{{ base_arch }} /etc/apt/preferences
COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{% endblock %}
@ -348,11 +348,20 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
] %}
{% set base_apt_keys = [
{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
] %}
{% if base_arch == "aarch64" %}
{% set base_apt_keys = base_apt_keys + [
{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
] %}
{% else %}
{% set base_apt_keys = base_apt_keys + [
{'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'},
] %}
{% endif %}
{# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
{% set base_remote_apt_keys = [
{'name': 'elasticsearch', 'url': 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'},

View File

@ -0,0 +1,37 @@
Package: rabbitmq-server
Pin: version 3.9.*
Pin-Priority: 1000
Package: erlang*
Pin: version 1:25.2.*
Pin-Priority: 1000
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
# Elasticsearch OSS.
Package: logstash-oss
Pin: version 7.9.*
Pin-Priority: 1000
# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
Package: td-agent*
Pin: version 4.4.2-1
Pin-Priority: 1000
# NOTE(hrw): we do not want backports unless requested
Package: *
Pin: release n=bullseye-backports
Pin-Priority: -1000
# NOTE(hrw): let us list some backports
# - openvswitch 2.15
# - ovn 21.06
# - libvirt 8
# - qemu 6.2
Package: openvswitch* python3-openvswitch ovn-* libvirt* qemu-*
Pin: release n=bullseye-backports
Pin-Priority: 1024
# NOTE(hrw): Debian OpenStack Team repo has some backports we do not want
Package: git*
Pin: release n=bullseye
Pin-Priority: 1024

View File

@ -0,0 +1,19 @@
Package: rabbitmq-server
Pin: version 3.9.*
Pin-Priority: 1000
Package: erlang*
Pin: version 1:25.2.*
Pin-Priority: 1000
# NOTE(mgoddard): logstash 7.9.x is the last version that supports
# Elasticsearch OSS.
Package: logstash-oss
Pin: version 7.9.*
Pin-Priority: 1000
# FIXME(SvenKieske): Pinning to 4.4.2 to avoid bug 2019557
Package: td-agent*
Pin: version 4.4.2-1
Pin-Priority: 1000

View File

@ -24,7 +24,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set kolla_toolbox_packages = [
'crudini',
'erlang-25.*',
'gcc',
'gdisk',
'git',
@ -40,6 +39,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'rabbitmq-server-3.9.*'
] %}
{% if base_arch == 'aarch64' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + ['erlang-25.*'] %}
{% else %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + ['erlang-25.2.*'] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set kolla_toolbox_packages = [
'build-essential',

View File

@ -20,11 +20,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [
'erlang-25.*',
'hostname',
'rabbitmq-server-3.9.*'
] %}
{% if base_arch == 'aarch64' %}
{% set rabbitmq_packages = rabbitmq_packages + ['erlang-25.*'] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + ['erlang-25.2.*'] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set rabbitmq_packages = [
'logrotate',

View File

@ -87,7 +87,7 @@ debian:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -254,7 +254,7 @@ ubuntu:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"