Merge pull request #177 from stackhpc/upstream/wallaby-2022-11-07

Synchronise wallaby with upstream

Author: markgoddard

docker/base/Dockerfile.j2

@@ -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',
@@ -358,8 +358,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <[email protected]> #}
     {# A20F259AEB9C94BB                         -- Sensuapp (Freight) <[email protected]> #}
     {# F1656F24C74CD1D8                         -- MariaDB Signing Key <[email protected]> #}
-    {# E495BB49CC4BBE5B                         -- Cloudsmith RabbitMQ Erlang repository key #}
     {# 9F4587F226208342                         -- Cloudsmith RabbitMQ repository key #}
+    {# F77F1EDA57EBB1CC                         -- Team RabbitMQ Erlang PPA #}
     {% set base_apt_keys = [
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -369,8 +369,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',
@@ -380,8 +380,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',

docker/base/apt_preferences.debian

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

docker/base/apt_preferences.ubuntu

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

docker/base/erlang-solutions.repo

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

docker/base/hrw-copr-erlang-for-rabbitmq.repo

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

docker/kolla-toolbox/Dockerfile.j2

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

docker/rabbitmq/Dockerfile.j2

@@ -23,7 +23,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"
@@ -58,7 +58,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"
@@ -69,7 +69,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"
@@ -80,7 +80,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"
@@ -92,7 +92,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"