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

This commit is contained in:
Jenkins 2017-08-31 13:56:29 +00:00 committed by Gerrit Code Review
commit 66014b5075

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