diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2018-12-10 18:36:32 +0100 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2018-12-11 19:31:24 +0000 |
| commit | 32beb0a642b10c2dfe7443e6adda0687d38029c7 (patch) | |
| tree | 6e3fce607f06e2876e672a49b6ed12d1ebbf73bb /docker | |
| parent | 9bc2472705d31704ffcabe09bcc1e38447a5be6b (diff) | |
| download | kolla-32beb0a642b10c2dfe7443e6adda0687d38029c7.tar.gz kolla-32beb0a642b10c2dfe7443e6adda0687d38029c7.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/barbican/barbican-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | 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 2fbfc24d7..5cb53092b 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 0fc920ada..49cf839a7 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 9e2298668..d63bcb83e 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 9bf036939..f0d3e15ba 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', |