Merge "Pass rabbitmq apt preferences into kolla-toolbox"

Zuul · openstack-gerrit · commit 139851087e15 · 2024-07-09T14:49:31.000Z
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -18,6 +18,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 = [
         'crudini',
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/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`