openstack/kolla
Code Issues Proposed changes

rabbitmq: handle Debian and aarch64 properly

Browse Source 
Debian 'stretch' has rabbitmq-server 3.6.10 in backports repository so
we will use it instead of external version.

Also take care of 'erlang-base-hipe' (or rather lack of it) on AArch64
architecture.

Depends-on: I72d1d1c10cbc4c5fe0907e395b6d7c969353dff8

Change-Id: Id332215b1e05e6edf18efd85c4463993bb7b321f
This commit is contained in:
Marcin Juszkiewicz 2017-12-13 15:20:56 +00:00
parent 628af2f8b0
commit ebfc1e7512
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docker/rabbitmq/Dockerfile.j2
View File

@ -17,13 +17,32 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set rabbitmq_packages = [ {% set rabbitmq_packages = [
'erlang-base-hipe',
'erlang-nox', 'erlang-nox',
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb',
'logrotate', 'logrotate',
'socat' 'socat'
] %} ] %}
{% if base_distro == 'debian' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'rabbitmq-server/stretch-backports'
] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + [
'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb',
] %}
{% endif %}
{% if base_arch == 'aarch64' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-base',
] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-base-hipe',
] %}
{% endif %}
{% endif %} {% endif %}
{{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }}