diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-27 19:02:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-27 19:02:50 +0000 |
| commit | 0fcc9a9086132be7bf3e696a4aa7b907b2471f6f (patch) | |
| tree | b838d42fd7be1bb83d3014b336091edc8191e883 /docker | |
| parent | 93f9962774f46b5170f127695208597245065dff (diff) | |
| parent | 1e2a6dba0348a9692aeb668c8b10b7de3ebf66f9 (diff) | |
| download | kolla-0fcc9a9086132be7bf3e696a4aa7b907b2471f6f.tar.gz kolla-0fcc9a9086132be7bf3e696a4aa7b907b2471f6f.zip | |
Merge "Install RabbitMQ in kolla-toolbox image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 683650809..38e7f1b78 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -9,7 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {{ macros.configure_user(name='ansible') }} +{{ macros.configure_user(name='rabbitmq') }} +# 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', @@ -25,7 +28,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mariadb-devel', 'openssh-clients', 'openssl-devel', - 'python-devel' + 'python-devel', + 'rabbitmq-server-3.7.10', ] %} {% elif base_package_type == 'deb' %} @@ -43,6 +47,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mariadb-client', 'python3-dev' ] %} + {% 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")) }} |