openstack
/
kolla
Code Issues Proposed changes

openstack-base: link everything with OpenSSL 1.0.x instead of 1.1 

OpenSSL 1.1 is not fully source compatible with 1.0.x so
python-qpid-proton fails to build for Debian (which uses OpenSSL 1.1 as
default).

Installing development package for 1.0.2 gets it back to buildable
state.

Python-qpid-proton is fixed upstream but no release was made yet.

Closes-Bug: #1714218

Change-Id: I731fe92410f340105e1a53372d33fdbb4798eaa3
This commit is contained in:
Marcin Juszkiewicz 2017-08-29 15:30:41 +02:00
parent 44f5923199
commit f436e7bb45
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/openstack-base/Dockerfile.j2
View File

@ -240,7 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive
'ca-certificates',
'git',
'libffi-dev',
'libssl-dev',
'libxml2-dev',
'libxslt1-dev',
'libyaml-dev',
@ -259,10 +258,17 @@ ENV DEBIAN_FRONTEND noninteractive
'libmariadbclient-dev'
] %}
{% endif %}
# Debian/stretch ships libmysqlclient.so in separate package
# Debian/stretch uses OpenSSL 1.1 as default, we need 1.0.2 one
{% if base_distro == 'debian' %}
{% set openstack_base_packages = openstack_base_packages + [
'libmariadbclient-dev-compat'
'libmariadbclient-dev-compat',
'libssl1.0-dev',
] %}
{% else %}
{% set openstack_base_packages = openstack_base_packages + [
'libssl-dev',
] %}
{% endif %}
{% endif %}