Move apt_prefs pins to respective images

mnasiadka · MoteHue · commit 0f6b1a2c7063 · 2024-07-12T09:13:39.000+01:00
This commit also contains a fix from I64e9442545d98364585e3c632ae9142cd6b4f9bf The two backports are combined as both are required for successful builds of rabbitmq and kolla-toolbox Closes-Bug: #2066171 Change-Id: I9eb51e079fee1322bcaaf9d481cd7890aeb77696 (cherry picked from commit 6e1ddf5)
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
@@ -1,7 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.11.*
-Pin-Priority: 1000
-
 # NOTE(hrw): we do not want backports unless requested
 Package: *
 Pin: release n=bullseye-backports
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
@@ -1,7 +1,3 @@
-Package: rabbitmq-server
-Pin: version 3.11.*
-Pin-Priority: 1000
-
 Package: *
 Pin: origin dlm.mariadb.com
 Pin-Priority: 1000
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -15,6 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
 
+{% block rabbitmq_apt_preferences %}
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
+{% endif %}
+{% endblock %}
+
 {% if base_package_type == 'rpm' %}
 
     {% set kolla_toolbox_packages = [
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.debian b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian
@@ -0,0 +1 @@
+../rabbitmq/apt_preferences_rabbitmq.debian
diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1 @@
+../rabbitmq/apt_preferences_rabbitmq.debian
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
@@ -11,6 +11,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
 
+{% block rabbitmq_apt_preferences %}
+{% if base_package_type == 'deb' %}
+COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
+{% endif %}
+{% endblock %}
+
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.11.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 25.*
+Pin-Priority: 1000
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
@@ -0,0 +1,7 @@
+Package: rabbitmq-server
+Pin: version 3.11.*
+Pin-Priority: 1000
+
+Package: erlang
+Pin: version 25.*
+Pin-Priority: 1000
diff --git a/releasenotes/notes/pass-rmq-preferences-into-kolla-toolbox-32d7209c4cf1f3c9.yaml b/releasenotes/notes/pass-rmq-preferences-into-kolla-toolbox-32d7209c4cf1f3c9.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where kolla-toolbox will fail to build due to mismatched
+    rabbitmq-server dependencies.
+    `LP#2066171 <https://launchpad.net/bugs/2066171>`__

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