Merge "debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1"
This commit is contained in:
commit
725bb6156a
@ -37,28 +37,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'git',
|
'git',
|
||||||
'jq',
|
'jq',
|
||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
|
'libmariadbclient-dev',
|
||||||
'libssl-dev',
|
'libssl-dev',
|
||||||
'libxslt1-dev',
|
'libxslt1-dev',
|
||||||
'mariadb-client',
|
'mariadb-client',
|
||||||
'python-dev'
|
'python-dev'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
|
|
||||||
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
|
|
||||||
'libmysqlclient-dev'
|
|
||||||
] %}
|
|
||||||
{% else %}
|
|
||||||
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
|
|
||||||
'libmariadbclient-dev'
|
|
||||||
] %}
|
|
||||||
{% endif %}
|
|
||||||
# Debian/stretch ships libmysqlclient.so in separate package
|
|
||||||
{% if base_distro == 'debian' %}
|
|
||||||
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
|
|
||||||
'libmariadbclient-dev-compat'
|
|
||||||
] %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
|
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
|
||||||
|
|
||||||
|
@ -228,7 +228,9 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||||||
'ca-certificates',
|
'ca-certificates',
|
||||||
'git',
|
'git',
|
||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
|
'libmariadbclient-dev',
|
||||||
'libpq-dev',
|
'libpq-dev',
|
||||||
|
'libssl-dev',
|
||||||
'libxml2-dev',
|
'libxml2-dev',
|
||||||
'libxslt1-dev',
|
'libxslt1-dev',
|
||||||
'libyaml-dev',
|
'libyaml-dev',
|
||||||
@ -238,28 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||||||
'zip'
|
'zip'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
|
|
||||||
{% set openstack_base_packages = openstack_base_packages + [
|
|
||||||
'libmysqlclient-dev'
|
|
||||||
] %}
|
|
||||||
{% else %}
|
|
||||||
{% set openstack_base_packages = openstack_base_packages + [
|
|
||||||
'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',
|
|
||||||
'libssl1.0-dev',
|
|
||||||
] %}
|
|
||||||
{% else %}
|
|
||||||
{% set openstack_base_packages = openstack_base_packages + [
|
|
||||||
'libssl-dev',
|
|
||||||
] %}
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
|
||||||
|
Loading…
Reference in New Issue
Block a user