aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-23 06:55:01 +0000
committerGerrit Code Review <review@openstack.org>2018-01-23 06:55:01 +0000
commit9d47c13a545bdbab1c143c31d300025a54aeb984 (patch)
tree069ad61e09ffbfceb432377ba5fddc30ec2a0729 /docker/kolla-toolbox
parent5ea4cf417129cefe91f54cbfdc70bb20ca70bce6 (diff)
parenta729d132d6a8a891dc0ab92c9bda094a59cea231 (diff)
downloadkolla-9d47c13a545bdbab1c143c31d300025a54aeb984.tar.gz
kolla-9d47c13a545bdbab1c143c31d300025a54aeb984.zip
Merge "Consume RDO packaged mariadb version"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j218
1 files changed, 2 insertions, 16 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 4af7a54c0..8ab872abe 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -20,27 +20,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libxml2-devel',
'libxslt-devel',
'make',
+ 'mariadb',
+ 'mariadb-devel',
'openssh-clients',
'openssl-devel',
'python-devel'
] %}
- # On x86-64 packages from external repos are used. lowercase names goes
- # conflicts and build fails. Other architectures use standard CentOS
- # packages.
- {% if base_arch == 'x86_64' %}
- {% set kolla_toolbox_packages = kolla_toolbox_packages + [
- 'MariaDB-client',
- 'MariaDB-devel',
- 'MariaDB-shared'
- ] %}
- {% else %}
- {% set kolla_toolbox_packages = kolla_toolbox_packages + [
- 'mariadb',
- 'mariadb-devel'
- ] %}
- {% endif %}
-
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set kolla_toolbox_packages = [
'build-essential',