diff options
| author | Zuul <zuul@review.openstack.org> | 2018-01-23 06:55:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-01-23 06:55:01 +0000 |
| commit | 9d47c13a545bdbab1c143c31d300025a54aeb984 (patch) | |
| tree | 069ad61e09ffbfceb432377ba5fddc30ec2a0729 /docker/openstack-base | |
| parent | 5ea4cf417129cefe91f54cbfdc70bb20ca70bce6 (diff) | |
| parent | a729d132d6a8a891dc0ab92c9bda094a59cea231 (diff) | |
| download | kolla-9d47c13a545bdbab1c143c31d300025a54aeb984.tar.gz kolla-9d47c13a545bdbab1c143c31d300025a54aeb984.zip | |
Merge "Consume RDO packaged mariadb version"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9ee1863f7..bc7d4e9e9 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -167,12 +167,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'tcp_wrappers-libs' ] %} - {% if base_arch == 'x86_64' %} - {% set openstack_base_packages = openstack_base_packages + [ - 'Percona-Server-shared-56' - ] %} - {% endif %} - {% elif base_distro in ['debian', 'ubuntu'] %} # This will prevent questions from being asked during the install @@ -225,6 +219,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', + 'mariadb-devel', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -234,19 +229,6 @@ ENV DEBIAN_FRONTEND noninteractive 'zip' ] %} - # 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 openstack_base_packages = openstack_base_packages + [ - 'MariaDB-devel' - ] %} - {% else %} - {% set openstack_base_packages = openstack_base_packages + [ - 'mariadb-devel' - ] %} - {% endif %} - {% elif base_distro in ['debian', 'ubuntu'] %} {% set openstack_base_packages = [ 'build-essential', |