From 32beb0a642b10c2dfe7443e6adda0687d38029c7 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Mon, 10 Dec 2018 18:36:32 +0100 Subject: [PATCH] Required changes for mariadb 10.3 Mysql-python is a deprecated package and fails to build currently. Make use of mysqlclient as is a fork of mysql-python with many bug fixes a python3 support. percona xtrabackup doenst work with mariadb 10.3, replaces to use mariadb-backup tool. https://jira.mariadb.org/browse/MDEV-15774 Change-Id: Icefe3a77fb12d57c869521000d458e3f58435374 --- docker/barbican/barbican-base/Dockerfile.j2 | 2 +- docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/mariadb/Dockerfile.j2 | 4 ++-- docker/openstack-base/Dockerfile.j2 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 2fbfc24d79..5cb53092b2 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set barbican_base_pip_packages = [ '/barbican', - 'MySQL-python', + 'mysqlclient', 'pastedeploy', 'python-barbicanclient', 'uwsgi' diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 0fc920adaa..49cf839a7f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -81,7 +81,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH 'ansible==2.2.0.0', '"cmd2<0.9.0"', 'influxdb', - 'MySQL-python', + 'mysqlclient', 'os-client-config==1.29.0', 'pbr==4.0.0', 'pymongo', diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 9e22986687..d63bcb83eb 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -14,7 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'hostname', 'mariadb', 'mariadb-server-galera', - 'percona-xtrabackup', + 'mariadb-backup', 'pv', 'rsync', 'tar' @@ -31,7 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% else %} {% set mariadb_packages = mariadb_packages + [ 'mariadb-server', - 'percona-xtrabackup' + 'mariadb-client' ] %} {% endif %} {% endif %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9bf0369399..f0d3e15baf 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -320,7 +320,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'kombu', 'monotonic', 'msgpack-python', - 'MySQL-python', + 'mysqlclient', 'netaddr', 'netifaces', 'os-client-config',