summaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-01-20 20:51:22 +0000
committerGerrit Code Review <review@openstack.org>2022-01-20 20:51:22 +0000
commitf7ef6c243af0d648e2d32254c52d20e9d0343ed1 (patch)
tree92821247775da8f4d85acec6babcc0b29404ada1 /docker/kolla-toolbox
parentca202d6323b24f965b2d39d00f048964eb3d9dcb (diff)
parent6b203efde7e60ae6ab63f230b4e9c944eb83c5a2 (diff)
downloadkolla-f7ef6c243af0d648e2d32254c52d20e9d0343ed1.tar.gz
kolla-f7ef6c243af0d648e2d32254c52d20e9d0343ed1.zip
Merge "Clean MariaDB/MySQL"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j26
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index c09c40843..541e8d94f 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',