Merge pull request #176 from stackhpc/upstream/xena-2022-10-31

Synchronise xena with upstream

Author: markgoddard

docker/base/Dockerfile.j2

@@ -97,7 +97,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',
         'mariadb-aarch64.repo',
         'proxysql.repo',
@@ -322,9 +322,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 #}

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

@@ -26,7 +26,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"
@@ -49,10 +49,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"
@@ -101,10 +101,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"
@@ -153,10 +153,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"
@@ -210,10 +210,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"

kolla/template/repos.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    RabbitMQ version has been updated to 3.9 and ERLang has been updated to 25.
+    Previously used versions (3.8 and 23) have been marked as end-of-life and
+    are not supported anymore as of August 2022.