diff options
| author | Zuul <zuul@review.opendev.org> | 2025-04-11 08:35:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-04-11 08:35:39 +0000 |
| commit | a0af54161e1734ab150dd5d7aea22947eadf0b91 (patch) | |
| tree | 4ecf51522f4166c74b00d30e1d18ac87b2558970 /docker | |
| parent | e7391f65bdaa7f0cb75443a5a0139415dc82550a (diff) | |
| parent | 74843405decb2a22abc9dfb8f4fe0aa524312e51 (diff) | |
| download | kolla-a0af54161e1734ab150dd5d7aea22947eadf0b91.tar.gz kolla-a0af54161e1734ab150dd5d7aea22947eadf0b91.zip | |
Merge "rabbitmq: Bump to 4.0"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.debian | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/apt_preferences_rabbitmq.ubuntu | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index d66ff3b66..0e057871c 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -38,7 +38,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq 'openvswitch', 'python3.12', 'python3.12-devel', - 'rabbitmq-server-3.13.*' + 'rabbitmq-server-4.0.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c37c7bf47..194e212f5 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -22,7 +22,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq {% set rabbitmq_packages = [ 'erlang-26.2.*', - 'rabbitmq-server-3.13.*' + 'rabbitmq-server-4.0.*' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian index 0e71a4d36..52b851f65 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.debian +++ b/docker/rabbitmq/apt_preferences_rabbitmq.debian @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.13.* +Pin: version 4.0.* Pin-Priority: 1000 Package: erlang diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu index 0e71a4d36..52b851f65 100644 --- a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu +++ b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu @@ -1,5 +1,5 @@ Package: rabbitmq-server -Pin: version 3.13.* +Pin: version 4.0.* Pin-Priority: 1000 Package: erlang |