Merge pull request #446 from stackhpc/upstream/2024.1-2025-07-21

bbezak · web-flow · commit d5dd04a38a9a · 2025-07-22T11:06:39.000+02:00
Synchronise 2024.1 with upstream
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ansible') }}
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
+{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-26', 'openvswitch', 'rabbitmq']) }}
 
 {% block rabbitmq_apt_preferences %}
 {% if base_package_type == 'deb' %}
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
@@ -1 +1 @@
-../rabbitmq/apt_preferences_rabbitmq.debian
+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu
diff --git a/docker/rabbitmq/rabbitmq-4-1/Dockerfile.j2 b/docker/rabbitmq/rabbitmq-4-1/Dockerfile.j2
@@ -0,0 +1 @@
+../rabbitmq/Dockerfile.j2
diff --git a/docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.debian
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 4.1.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:27.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq-4-1/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 4.1.*
+Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:27.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq-4-1/extend_start.sh b/docker/rabbitmq/rabbitmq-4-1/extend_start.sh
@@ -0,0 +1 @@
+../rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/rabbitmq-4-1/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq-4-1/healthcheck_rabbitmq
@@ -0,0 +1 @@
+../rabbitmq/healthcheck_rabbitmq
diff --git a/docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.centos
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-27.*',
+    'rabbitmq-server-4.1.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq-4-1/rabbitmq_packages_rpm.rocky
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-27.*',
+    'rabbitmq-server-4.1.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/rabbitmq/Dockerfile.j2
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='rabbitmq') }}
 
-{{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
+{{ macros.enable_extra_repos(['crb', 'erlang', 'erlang-26', 'erlang-27', 'rabbitmq']) }}
 
 {% block rabbitmq_apt_preferences %}
 {% if base_package_type == 'deb' %}
@@ -20,10 +20,8 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
-    {% set rabbitmq_packages = [
-        'erlang-26.2.*',
-        'rabbitmq-server-3.13.*'
-    ] %}
+    {% set filepath = "rabbitmq/" + image_name + "/rabbitmq_packages_rpm." + base_distro %}
+    {% from filepath import rabbitmq_packages %}
 
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [
diff --git a/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian
@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.13.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 26.2.*
+Package: erlang*
+Pin: version 1:26.2.*
 Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/rabbitmq/apt_preferences_rabbitmq.ubuntu
@@ -2,6 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.13.*
 Pin-Priority: 1000
 
-Package: erlang
-Pin: version 26.2.*
+Package: erlang*
+Pin: version 1:26.2.*
 Pin-Priority: 1000
diff --git a/docker/rabbitmq/rabbitmq/extend_start.sh b/docker/rabbitmq/rabbitmq/extend_start.sh
diff --git a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq
diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.centos
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}
diff --git a/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky b/docker/rabbitmq/rabbitmq/rabbitmq_packages_rpm.rocky
@@ -0,0 +1,4 @@
+{% set rabbitmq_packages = [
+    'erlang-26.2.*',
+    'rabbitmq-server-3.13.*'
+] %}
diff --git a/kolla/template/repos-noble.yaml b/kolla/template/repos-noble.yaml
@@ -1,7 +1,12 @@
 ---
 ubuntu:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "noble"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "noble"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -53,8 +58,13 @@ ubuntu:
     gpg_key: "docker-ce.asc"
 
 ubuntu-aarch64:
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "noble"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "noble"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -46,8 +46,13 @@ debian:
     suite: "bookworm"
     component: "stable"
     gpg_key: "docker-ce.asc"
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -98,8 +103,13 @@ debian-aarch64:
     suite: "bookworm"
     component: "stable"
     gpg_key: "docker-ce.asc"
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -191,8 +201,13 @@ ubuntu:
     suite: "jammy"
     component: "stable"
     gpg_key: "docker-ce.asc"
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -243,8 +258,13 @@ ubuntu-aarch64:
     suite: "noble"
     component: "stable"
     gpg_key: "docker-ce.asc"
-  erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+  erlang-26:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-26/ubuntu"
+    suite: "jammy"
+    component: "main"
+    gpg_key: "erlang-ppa.gpg"
+  erlang-27:
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-27/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../rabbitmq/apt_preferences_rabbitmq.debian`
	`1`	`+../rabbitmq/rabbitmq/apt_preferences_rabbitmq.debian`