diff options
| author | Zuul <zuul@review.opendev.org> | 2024-07-09 14:49:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-07-09 14:49:31 +0000 |
| commit | 139851087e15e0aa0c47765768bcdc1da80246d6 (patch) | |
| tree | 593c5ed910106b3b03dce911975e22d5246f6915 | |
| parent | b4972ebec96084adf8eb1124aec07445323b8df3 (diff) | |
| parent | 006ccee101b3944eeb22299226d45520850dba0e (diff) | |
| download | kolla-139851087e15e0aa0c47765768bcdc1da80246d6.tar.gz kolla-139851087e15e0aa0c47765768bcdc1da80246d6.zip | |
Merge "Pass rabbitmq apt preferences into kolla-toolbox"
4 files changed, 14 insertions, 0 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 413e57a41..fbca153e8 100644 --- 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 new file mode 120000 index 000000000..f1cc84d9b --- /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 000000000..f1cc84d9b --- /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/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 000000000..4b3a23e3b --- /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 <https://launchpad.net/bugs/2066171>`__ |