diff options
| author | Steven Dake <stdake@cisco.com> | 2017-12-26 16:18:14 +0800 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2018-01-21 19:19:57 +0100 |
| commit | a729d132d6a8a891dc0ab92c9bda094a59cea231 (patch) | |
| tree | c58c5c20944de52d4bdeeac6b5eb03d729d08661 /docker/openstack-base | |
| parent | e2666505a68875856c1785a5a7e18480c75eebc3 (diff) | |
| download | kolla-a729d132d6a8a891dc0ab92c9bda094a59cea231.tar.gz kolla-a729d132d6a8a891dc0ab92c9bda094a59cea231.zip | |
Consume RDO packaged mariadb version
RDO packaged mariadb recieves far more testing and qualification
than any other mariadb package on CentOS. Lets use that instead
of a hard-pinned old version of mariadb from mariadb.org.
This patch also upgrade MariaDB from 10.0 to 10.1.20 for
RHEL/CentOS/Oracle Linux.
Depends-On: I8374ac2219ad7880970cd789727d01af7cac1077
Depends-On: Ia2acb09e877a586243fc1acb49d8d140cf27d7b5
Co-Authored-By: Xinliang Liu <xinliang.liu@linaro.org>
Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b
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 dc50b2ec5..97ad60c4f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -160,12 +160,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 @@ -211,6 +205,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libxml2-devel', 'libxslt-devel', 'libyaml-devel', + 'mariadb-devel', 'openldap-devel', 'openssl-devel', 'postgresql', @@ -220,19 +215,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', |