Merge "Use APT pinning to set preferred version of RabbitMQ"

This commit is contained in:
Zuul 2019-12-13 10:59:19 +00:00 committed by Gerrit Code Review
commit 2ee796bdce
3 changed files with 7 additions and 21 deletions

View File

@ -0,0 +1,3 @@
Package: rabbitmq-server
Pin: version 3.7.10-1
Pin-Priority: 1000

View File

@ -47,17 +47,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libssl-dev',
'libxslt1-dev',
'mariadb-client',
'python3-dev'
'python3-dev',
'rabbitmq-server',
] %}
{% if base_distro == 'debian' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'rabbitmq-server',
] %}
{% else %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'rabbitmq-server=3.7.10-1',
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}

View File

@ -22,19 +22,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set rabbitmq_packages = [
'erlang-nox',
'logrotate'
'logrotate',
'rabbitmq-server',
] %}
{% if base_distro == 'debian' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'rabbitmq-server',
] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + [
'rabbitmq-server=3.7.10-1',
] %}
{% endif %}
{% if base_arch == 'aarch64' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-base',