From ba6d7540f6f2a779c03b7319158a89ae0fb04ec8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Fri, 14 Dec 2018 11:27:50 +0000
Subject: debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1

Now with Ubuntu 'bionic' being used we can drop
libmysqlclient-compat-dev package use and just go with mariadb packages
directly.

Also move to OpenSSL 1.1 for both distributions.

Change-Id: I147385a3da15878121c0a436b5c26ba100e9802d
---
 docker/openstack-base/Dockerfile.j2 | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'docker/openstack-base/Dockerfile.j2')

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 7af8cf02a..3aa308259 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -229,7 +229,9 @@ ENV DEBIAN_FRONTEND noninteractive
             'ca-certificates',
             'git',
             'libffi-dev',
+            'libmariadbclient-dev',
             'libpq-dev',
+            'libssl-dev',
             'libxml2-dev',
             'libxslt1-dev',
             'libyaml-dev',
@@ -239,28 +241,6 @@ ENV DEBIAN_FRONTEND noninteractive
             '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 %}
 
 {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
-- 
cgit v1.2.3