Merge "monasca, tempest: install librdkafka-dev to get it built for non-x86/source"

This commit is contained in:
Zuul 2019-03-21 14:12:39 +00:00 committed by Gerrit Code Review
commit f8976953bf
2 changed files with 8 additions and 0 deletions

View File

@ -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")) }}

View File

@ -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'
] %}