diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-10 11:02:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-10 11:02:17 +0000 |
| commit | bd31b73f33e039cc9589c3b03352c22c3db08ace (patch) | |
| tree | 5abb1dda85b796dff5b922a74ee3e492efe9c22f /docker | |
| parent | ae0c337e023552aa341fc7cb0874bcc3248f1e1d (diff) | |
| parent | 2ed6ce5d1db918ecee449dd3e2df61b091e813ef (diff) | |
| download | kolla-bd31b73f33e039cc9589c3b03352c22c3db08ace.tar.gz kolla-bd31b73f33e039cc9589c3b03352c22c3db08ace.zip | |
Merge "kolla-toolbox: use proper mariadb packages on CentOS/non-x86"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 6e2014770..2bc220529 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -36,8 +36,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% else %} {% set kolla_toolbox_packages = kolla_toolbox_packages + [ 'mariadb', - 'mariadb-devel', - 'mariadb-shared' + 'mariadb-devel' ] %} {% endif %} |