diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-21 14:12:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-21 14:12:39 +0000 |
| commit | f8976953bf1bf20ae3417d07fe9c52a12edcb399 (patch) | |
| tree | 0ae3e5aa86bc93a4a72de26da7321f5db11827a3 /docker | |
| parent | 03eb40bc1b917af851eeb2a46f9aa58052d35e0b (diff) | |
| parent | 32ea1aab493a069b056efaaf481fc5d459d48ecf (diff) | |
| download | kolla-f8976953bf1bf20ae3417d07fe9c52a12edcb399.tar.gz kolla-f8976953bf1bf20ae3417d07fe9c52a12edcb399.zip | |
Merge "monasca, tempest: install librdkafka-dev to get it built for non-x86/source"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/monasca/monasca-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2 index 37baeade8..db31322c5 100644 --- a/docker/monasca/monasca-base/Dockerfile.j2 +++ b/docker/monasca/monasca-base/Dockerfile.j2 @@ -33,6 +33,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set monasca_base_packages = [ 'apache2', 'libapache2-mod-wsgi', + 'librdkafka-dev' ] %} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index b84841afb..c2c16e15a 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -27,6 +27,13 @@ RUN ln -sf /var/lib/tempest /tempest ADD tempest-archive /tempest-source ADD plugins-archive / +{% if base_package_type == 'deb' and base_arch not in ['x86_64'] %} + {% set tempest_source_packages = ['librdkafka-dev'] %} + +{{ macros.install_packages(tempest_source_packages | customizable("source_packages")) }} +{% endif %} + + {% set tempest_pip_packages = [ '/tempest' ] %} |