From 729bd45077e5bbbc4c23ce873eeb6768c8cf2a40 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 17 Jun 2020 13:13:09 +0200 Subject: CI: Install python deps, fix mod_wsgi in cyborg-api, disable masakari-monitors setuptools is missing from infra image - so it needs to be installed. Copy cat of a kolla-ansible change: https://review.opendev.org/#/c/735808/ Fixes also cyborg-api to use py3 mod_wsgi in centos8 Temporarily disables masakari-monitors build, because it fails on centos8 due to problems with libvirt-python===5.7.0 (upper-constraints): Missing type converters: virTypedParameterPtr:1 ERROR: failed virConnectSetIdentity Depends-On: https://review.opendev.org/#/c/736744/ Change-Id: I6068abcbc0e73eeab77b0aa99983a95adc6defd3 --- docker/cyborg/cyborg-api/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/cyborg') diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index b856aa775..ad8dc4d04 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -13,8 +13,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if base_package_type == 'rpm' %} {% set cyborg_api_packages = [ 'mod_ssl', - 'mod_wsgi' ] %} + {% if distro_python_version.startswith('3') %} + {% set cyborg_api_packages = cyborg_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set cyborg_api_packages = cyborg_api_packages + ['mod_wsgi'] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set cyborg_api_packages = [ 'apache2', -- cgit v1.2.3