openstack/kolla
Code Issues Proposed changes

Merge "Pass rabbitmq apt preferences into kolla-toolbox"

Browse Source
This commit is contained in:
Zuul 2024-07-09 14:49:31 +00:00 committed by Gerrit Code Review
commit 139851087e
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/kolla-toolbox/Dockerfile.j2
View File

@ -18,6 +18,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }} {{ 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' %} {% if base_package_type == 'rpm' %}
{% set kolla_toolbox_packages = [ {% set kolla_toolbox_packages = [
'crudini', 'crudini',

1
docker/kolla-toolbox/apt_preferences_rabbitmq.debian Symbolic link
View File

@ -0,0 +1 @@
../rabbitmq/apt_preferences_rabbitmq.debian

1
docker/kolla-toolbox/apt_preferences_rabbitmq.ubuntu Symbolic link
View File

@ -0,0 +1 @@
../rabbitmq/apt_preferences_rabbitmq.debian

6
releasenotes/notes/pass-rmq-preferences-into-kolla-toolbox-32d7209c4cf1f3c9.yaml Normal file
View File

@ -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>`__