Skip to content

Synchronise wallaby with upstream #177

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 1 commit into from
Nov 7, 2022
Merged

Synchronise wallaby with upstream #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -93,7 +93,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% elif base_arch == 'aarch64' %}
{% set base_yum_repo_files = [
'elasticsearch.repo',
'erlang-solutions.repo',
'hrw-copr-erlang-for-rabbitmq.repo',
'grafana.repo',
'rabbitmq_rabbitmq-server.repo',
'td.repo',
Expand Down Expand Up @@ -356,8 +356,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
{# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #}
{# F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
{# E495BB49CC4BBE5B -- Cloudsmith RabbitMQ Erlang repository key #}
{# 9F4587F226208342 -- Cloudsmith RabbitMQ repository key #}
{# F77F1EDA57EBB1CC -- Team RabbitMQ Erlang PPA #}
{% set base_apt_keys = [
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
Expand All @@ -367,8 +367,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'901F9177AB97ACBE',
'A20F259AEB9C94BB',
'F1656F24C74CD1D8',
'E495BB49CC4BBE5B',
'9F4587F226208342',
'F77F1EDA57EBB1CC',
] %}
{% set base_remote_apt_keys = [
'https://packages.grafana.com/gpg.key',
Expand All @@ -378,8 +378,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{% set base_apt_keys = [
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'F1656F24C74CD1D8',
'E495BB49CC4BBE5B',
'9F4587F226208342',
'F77F1EDA57EBB1CC',
] %}
{% set base_remote_apt_keys = [
'https://download.docker.com/linux/debian/gpg',
Expand Down
5 changes: 2 additions & 3 deletions docker/base/apt_preferences.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
Package: rabbitmq-server
Pin: version 3.8.*
Pin: version 3.9.*
Pin-Priority: 1000

# RabbitMQ wants 23+ and we want to stay on 23 if possible
Package: erlang*
Pin: version 1:23.*
Pin: version 1:25.*
Pin-Priority: 1000

# NOTE(mgoddard): logstash 7.9.x is the last version that supports
Expand Down
4 changes: 2 additions & 2 deletions docker/base/apt_preferences.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: rabbitmq-server
Pin: version 3.8.*
Pin: version 3.9.*
Pin-Priority: 1000

Package: erlang*
Pin: version 1:23.*
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
4 changes: 2 additions & 2 deletions 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-23.*',
'erlang-25.*',
'gcc',
'gdisk',
'git',
Expand All @@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssl-devel',
'openvswitch',
'python3-devel',
'rabbitmq-server-3.8.*'
'rabbitmq-server-3.9.*'
] %}

{% elif base_package_type == 'deb' %}
Expand Down
4 changes: 2 additions & 2 deletions docker/rabbitmq/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}

{% set rabbitmq_packages = [
'erlang-23.*',
'erlang-25.*',
'hostname',
'rabbitmq-server-3.8.*'
'rabbitmq-server-3.9.*'
] %}

{% elif base_package_type == 'deb' %}
Expand Down
10 changes: 5 additions & 5 deletions kolla/template/repos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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 Down Expand Up @@ -59,7 +59,7 @@ rhel:

debian:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main"
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
Expand All @@ -70,7 +70,7 @@ debian:

debian-aarch64:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian bullseye main"
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/debian bullseye stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
Expand All @@ -81,7 +81,7 @@ debian-aarch64:

ubuntu:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
Expand All @@ -93,7 +93,7 @@ ubuntu:

ubuntu-aarch64:
elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"
erlang: "deb https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
grafana: "deb https://packages.grafana.com/oss/deb stable main"
influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
Expand Down