Skip to content

Synchronise yoga with upstream #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 24, 2022
Merged

Synchronise yoga with upstream #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b5e7b6
rabbitmq: use Erlang from PPA on Debian/Ubuntu
hrw Oct 12, 2022
05a316f
rabbitmq: bump Erlang version to 25.x
Oct 19, 2022
aa92e60
Merge "rabbitmq: bump Erlang version to 25.x" into stable/yoga
Oct 19, 2022
b7c886a
rabbitmq/aarch64: use COPR for Erlang
Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker/base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
] %}
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = base_yum_repo_files + [
'erlang-solutions.repo',
'hrw-copr-erlang-for-rabbitmq.repo',
'mariadb-aarch64.repo',
] %}

Expand Down Expand Up @@ -312,9 +312,9 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
] %}

{% set base_apt_keys = [
{'name': 'erlang', 'keyid': 'E495BB49CC4BBE5B'},
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
] %}

{# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
Expand Down
2 changes: 1 addition & 1 deletion docker/base/apt_preferences.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pin: version 3.9.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:24.*
Pin: version 1:25.*
Pin-Priority: 1000

# NOTE(mgoddard): logstash 7.9.x is the last version that supports
Expand Down
2 changes: 1 addition & 1 deletion docker/base/apt_preferences.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Pin: version 3.9.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:24.*
Pin: version 1:25.*
Pin-Priority: 1000

# NOTE(mgoddard): logstash 7.9.x is the last version that supports
Expand Down
6 changes: 0 additions & 6 deletions docker/base/erlang-solutions.repo
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions docker/base/hrw-copr-erlang-for-rabbitmq.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# NOTE(hrw): this repository contains rebuild of Erlang package from RabbitMQ team
# from https://github.com/rabbitmq/erlang-rpm/
# Thanks to COPR we have aarch64 packages for CentOS Stream 8/9

[copr-hrw-erlang-for-rabbitmq]
name=Hrw's COPR with Erlang build for RabbitMQ
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
gpgcheck=1
enabled=0
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
repo_gpgcheck=0
2 changes: 1 addition & 1 deletion docker/kolla-toolbox/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build

{% set kolla_toolbox_packages = [
'crudini',
'erlang-24.*',
'erlang-25.*',
'gcc',
'gdisk',
'git',
Expand Down
2 changes: 1 addition & 1 deletion docker/rabbitmq/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}

{% set rabbitmq_packages = [
'erlang-24.*',
'erlang-25.*',
'hostname',
'rabbitmq-server-3.9.*'
] %}
Expand Down
22 changes: 11 additions & 11 deletions kolla/template/repos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ centos-aarch64:
elasticsearch: "elasticsearch-kibana-logstash-7.x"
epel: "epel"
epel-modular: "epel-modular"
erlang: "erlang-solutions"
erlang: "copr-hrw-erlang-for-rabbitmq"
extras: "extras"
grafana: "grafana"
hacluster: "ha"
Expand All @@ -47,10 +47,10 @@ debian:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
suite: "bullseye"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang.gpg"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
suite: "stable"
Expand Down Expand Up @@ -99,10 +99,10 @@ debian-aarch64:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
suite: "bullseye"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang.gpg"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
suite: "stable"
Expand Down Expand Up @@ -151,10 +151,10 @@ ubuntu:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang.gpg"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
suite: "stable"
Expand Down Expand Up @@ -208,10 +208,10 @@ ubuntu-aarch64:
component: "main"
gpg_key: "elasticsearch.asc"
erlang:
url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang.gpg"
gpg_key: "erlang-ppa.gpg"
grafana:
url: "https://packages.grafana.com/oss/deb"
suite: "stable"
Expand Down