Merge "Clean MariaDB/MySQL"

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'

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',

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")) }}

docker/openstack-base/Dockerfile.j2

@@ -123,7 +123,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'python3-memcache',
             'python3-mistralclient',
             'python3-muranoclient',
-            'python3-mysqldb',
             'python3-openstackclient',
             'python3-oslo.log',
             'python3-osprofiler',
@@ -155,7 +154,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'libxslt-devel',
             'libyaml-devel',
             'make',
-            'mariadb-devel',
             'mod_ssl',
             'openssl',
             'openssl-devel',
@@ -176,7 +174,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'git',
             'libapache2-mod-wsgi-py3',
             'libffi-dev',
-            'libmariadb-dev-compat',
             'libpcre3-dev',
             'libpq-dev',
             'libssl-dev',
@@ -240,7 +237,6 @@ ENV DEBIAN_FRONTEND noninteractive
         'kombu',
         'logutils',
         'monotonic',
-        'mysqlclient',
         'netaddr',
         'netifaces',
         'os-brick',

docker/placement/placement-base/Dockerfile.j2

@@ -14,14 +14,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',
         ] %}
 
@@ -34,13 +32,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 %}