Merge "Consume RDO packaged mariadb version"

7 files changed, 10 insertions, 63 deletions

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 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',
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',
diff --git a/releasenotes/upgrage-to-mariadb-10.1.20-for-redhat-family-93df8bf63da25659.yaml b/releasenotes/upgrage-to-mariadb-10.1.20-for-redhat-family-93df8bf63da25659.yaml
new file mode 100644
index 000000000..6e3e8e004
--- /dev/null
+++ b/releasenotes/upgrage-to-mariadb-10.1.20-for-redhat-family-93df8bf63da25659.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Upgrade to MariaDB 10.1.20 for RHEL/CentOS/Oracle Linux.