aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorDincer Celik <hello@dincercelik.com>2019-11-18 18:58:57 +0300
committerDincer Celik <hello@dincercelik.com>2020-04-06 15:14:02 +0300
commitf1f1d854594da23321ad94ae6358ecbdc119d18e (patch)
treee649a3ead4a9df015f23d3406f105100bd379f01 /docker/kolla-toolbox
parent7fe77b361eccdf1fec169fce54049f94f1c5f7e0 (diff)
downloadkolla-f1f1d854594da23321ad94ae6358ecbdc119d18e.tar.gz
kolla-f1f1d854594da23321ad94ae6358ecbdc119d18e.zip
Upgrade RabbitMQ to 3.8
Upgrade and pin RabbitMQ to 3.8. Upgrade Erlang to 22 to meet requirements: https://www.rabbitmq.com/which-erlang.html Start using bintray repository provided by RabbitMQ. Linaro builds will be used for aarch64. Implements: blueprint rabbitmq-version-upgrade Closes-Bug: #1848452 Change-Id: I3d775fd832f2603181da89009cebc1370a61a023
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j210
1 files changed, 3 insertions, 7 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 44ebaf329..039d02e1c 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -13,10 +13,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ansible') }}
{{ macros.configure_user(name='rabbitmq') }}
-{{ macros.enable_extra_repos(['rabbitmq']) }}
+{{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }}
-# NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
-# https://bugs.launchpad.net/kolla/+bug/1814233
{% if base_package_type == 'rpm' %}
{% set kolla_toolbox_packages = [
'crudini',
@@ -36,14 +34,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if distro_package_manager == 'dnf' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'python3-devel',
- 'rabbitmq-server-3.7.*'
+ 'rabbitmq-server-3.8.*'
] %}
{% else %}
- # NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met
- # https://bugs.launchpad.net/kolla/+bug/1814233
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'python-devel',
- 'rabbitmq-server-3.7.10'
+ 'rabbitmq-server-3.8.*'
] %}
{% endif %}