From 6b203efde7e60ae6ab63f230b4e9c944eb83c5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sat, 2 Oct 2021 09:28:56 +0000
Subject: [PATCH] Clean MariaDB/MySQL

We are just overinstalling these.
PyMySQL is enough nowadays.

Change-Id: I074d9d13f52c208c0f3d92ea060b3b9abb6a6b9e
---
 docker/barbican/barbican-base/Dockerfile.j2   | 1 -
 docker/kolla-toolbox/Dockerfile.j2            | 6 +-----
 docker/monasca/monasca-api/Dockerfile.j2      | 2 --
 docker/openstack-base/Dockerfile.j2           | 4 ----
 docker/placement/placement-base/Dockerfile.j2 | 4 ----
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index fb4cf4ea6c..9b28727e50 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -29,7 +29,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% set barbican_base_pip_packages = [
     '/barbican',
-    'mysqlclient',
     'pastedeploy',
     'python-barbicanclient',
     'uwsgi'
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 01292c1357..7acb4f0f33 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -28,8 +28,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'libxml2-devel',
         'libxslt-devel',
         'make',
-        'mariadb',
-        'mariadb-devel',
         'openssh-clients',
         'openssl-devel',
         'openvswitch',
@@ -57,10 +55,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'git',
         'jq',
         'libffi-dev',
-        'libmariadb-dev-compat',
         'libssl-dev',
         'libxslt1-dev',
-        'mariadb-client',
         'openvswitch-switch',
         'python3-dev',
         'rabbitmq-server',
@@ -85,9 +81,9 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
         'ansible-core==2.11.*',
         'cmd2',
         'influxdb',
-        'mysqlclient',
         'os-client-config',
         'pbr',
+        'pymysql',
         'python-openstackclient',
         'pytz',
         'pyudev',
diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index e8337fae10..9469908f3c 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/docker/monasca/monasca-api/Dockerfile.j2
@@ -16,11 +16,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
     {% if base_package_type == 'rpm' %}
         {% set monasca_api_packages = [
-            'mariadb',
         ] %}
     {% elif base_package_type == 'deb' %}
         {% set monasca_api_packages = [
-            'mariadb-client',
         ] %}
     {% endif %}
 {{ macros.install_packages(monasca_api_packages | customizable("packages")) }}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index f0b330979c..45263db6d7 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -124,7 +124,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'python3-memcache',
             'python3-mistralclient',
             'python3-muranoclient',
-            'python3-mysqldb',
             'python3-openstackclient',
             'python3-oslo.log',
             'python3-osprofiler',
@@ -156,7 +155,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'libxslt-devel',
             'libyaml-devel',
             'make',
-            'mariadb-devel',
             'mod_ssl',
             'openssl',
             'openssl-devel',
@@ -177,7 +175,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'git',
             'libapache2-mod-wsgi-py3',
             'libffi-dev',
-            'libmariadb-dev-compat',
             'libpcre3-dev',
             'libpq-dev',
             'libssl-dev',
@@ -242,7 +239,6 @@ ENV DEBIAN_FRONTEND noninteractive
         'kombu',
         'logutils',
         'monotonic',
-        'mysqlclient',
         'netaddr',
         'netifaces',
         'os-brick',
diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2
index 4f35462db4..4472340471 100644
--- a/docker/placement/placement-base/Dockerfile.j2
+++ b/docker/placement/placement-base/Dockerfile.j2
@@ -13,14 +13,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set placement_base_packages = [
-            'mariadb',
             'openstack-placement-common',
         ] %}
 
     {% elif base_package_type == 'deb' %}
 
         {% set placement_base_packages = [
-            'mariadb-client',
             'placement-common',
         ] %}
     {% endif %}
@@ -40,13 +38,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set placement_base_packages = [
-            'mariadb',
         ] %}
 
     {% elif base_package_type == 'deb' %}
 
         {% set placement_base_packages = [
-            'mariadb-client',
         ] %}
 
     {% endif %}