diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-09-25 13:48:47 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-09-25 13:48:47 +0100 |
| commit | 1e2a6dba0348a9692aeb668c8b10b7de3ebf66f9 (patch) | |
| tree | da67de8bf0b69c576ccc0420f183cfbf3885ce20 /docker | |
| parent | e3b2bb78084866a4b2c8966bacfd8ce47161dc18 (diff) | |
| download | kolla-1e2a6dba0348a9692aeb668c8b10b7de3ebf66f9.tar.gz kolla-1e2a6dba0348a9692aeb668c8b10b7de3ebf66f9.zip | |
Install RabbitMQ in kolla-toolbox image
This allows us to execute RabbitMQ Ansible modules in the kolla-toolbox
container using the kolla ansible kolla_toolbox module.
Partially Implements: blueprint support-nova-cells
Change-Id: I2c10c7b4f7dbdd87f2dda7c40fa44cded07c57a5
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")) }} |