From a729d132d6a8a891dc0ab92c9bda094a59cea231 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 26 Dec 2017 16:18:14 +0800 Subject: 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 Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b --- docker/base/Dockerfile.j2 | 7 ------- docker/base/MariaDB.repo | 5 ----- docker/kolla-toolbox/Dockerfile.j2 | 18 ++---------------- docker/mariadb/Dockerfile.j2 | 17 ++--------------- docker/openstack-base/Dockerfile.j2 | 20 +------------------- docker/sensu/sensu-client/Dockerfile.j2 | 2 +- 6 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 docker/base/MariaDB.repo (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 2b4b67641..a3678f589 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -65,7 +65,6 @@ COPY yum.conf /etc/yum.conf 'grafana.repo', 'influxdb.repo', 'kibana.yum.repo', - 'MariaDB.repo', 'nfs_ganesha.repo', 'opendaylight.repo', 'sensu.repo', @@ -73,13 +72,7 @@ COPY yum.conf /etc/yum.conf 'zookeeper.repo' ] %} - {% set base_yum_url_packages = [ - 'http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-4.noarch.rpm' - ] %} - {% set base_yum_repo_keys = [ - 'http://yum.mariadb.org/RPM-GPG-KEY-MariaDB', - '/etc/pki/rpm-gpg/RPM-GPG-KEY-Percona', 'https://packages.elastic.co/GPG-KEY-elasticsearch', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', diff --git a/docker/base/MariaDB.repo b/docker/base/MariaDB.repo deleted file mode 100644 index ddbb1a21d..000000000 --- a/docker/base/MariaDB.repo +++ /dev/null @@ -1,5 +0,0 @@ -[mariadb] -name = MariaDB -baseurl = https://yum.mariadb.org/10.0/centos7-amd64 -gpgkey = https://yum.mariadb.org/RPM-GPG-KEY-MariaDB -gpgcheck = 1 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', diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 03987b18e..e583465f6 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -12,6 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'expect', 'galera', 'hostname', + 'mariadb', + 'mariadb-server-galera', 'percona-xtrabackup', 'pv', 'rsync', @@ -19,21 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'tar' ] %} - # 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 mariadb_packages = mariadb_packages + [ - 'MariaDB-client', - 'MariaDB-Galera-server' - ] %} - {% else %} - {% set mariadb_packages = mariadb_packages + [ - 'mariadb', - 'mariadb-galera-server' - ] %} - {% endif %} - {% elif base_distro in ['debian', 'ubuntu'] %} {% set mariadb_packages = [ 'expect', 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', diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index 855747501..03f75c229 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -7,12 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set sensu_client_packages = [ - 'MariaDB-client', 'ceph-common', 'cyrus-sasl-devel', 'docker-client', 'gcc-c++', 'make', + 'mariadb', 'ntp', 'osops-tools-monitoring-oschecks', 'python-pymongo', -- cgit v1.2.3