diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index fb93b21286..077c00d17b 100644 --- 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 index a9e30b7ca9..7cc49b4ad0 100644 --- 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 index 08316fc96e..8a39345e57 100644 --- 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 new file mode 120000 index 0000000000..f1cc84d9be --- /dev/null +++ b/docker/kolla-toolbox/apt_preferences_rabbitmq.debian @@ -0,0 +1 @@ +../rabbitmq/apt_preferences_rabbitmq.debian \ No newline at end of file diff --git a/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu new file mode 120000 index 0000000000..f1cc84d9be --- /dev/null +++ b/docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu @@ -0,0 +1 @@ +../rabbitmq/apt_preferences_rabbitmq.debian \ No newline at end of file diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c17cf0a194..f2cc7e1d05 100644 --- 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 new file mode 100644 index 0000000000..5c05bb96d1 --- /dev/null +++ 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 new file mode 100644 index 0000000000..5c05bb96d1 --- /dev/null +++ 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 new file mode 100644 index 0000000000..4b3a23e3b1 --- /dev/null +++ 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 `__