From 23339d18eae09f6252e42eee8ca58946b930d554 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 28 Jul 2022 19:14:52 +0200
Subject: [PATCH] Bump MariaDB version

With ersion upgrade we get rid of vexxhost repo that is not valid
anymore and cover some critical vulnarabilities that were found
in MariaDB.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-rabbitmq_server/+/850350
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_rally/+/850477
Change-Id: Ie8ee1618a686705fb49a6c784df6e499e98cb968
---
 defaults/main.yml     |  3 +--
 vars/ubuntu-20.04.yml | 13 +++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3629a0af..09413233 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -42,9 +42,8 @@ galera_mariadb_service_name: mariadb
 galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
 # The major version used to select the repo URL path
-# NOTE(noonedeadpunk) 10.4.13 seems broken, as it crushed during requests http://paste.openstack.org/show/794059/
 galera_major_version: 10.4
-galera_minor_version: 12
+galera_minor_version: 25
 
 # Set the URL for the MariaDB repository
 galera_repo_host: "downloads.mariadb.com"
diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml
index 664089e4..5873225e 100644
--- a/vars/ubuntu-20.04.yml
+++ b/vars/ubuntu-20.04.yml
@@ -21,7 +21,9 @@ _galera_disable_privatedevices: yes
 
 # Galera GPG Keys
 _galera_gpg_keys:
-  - url: http://repo.vexxhost.net/mariadb/key.gpg
+  # MariaDB Signing Key <signing-key@mariadb.org>
+  - id: C74CD1D8
+    file: /etc/ssl/mariadb-key
 
 galera_server_required_distro_packages:
   - apt-transport-https
@@ -50,16 +52,15 @@ _galera_mariadb_server_package: "mariadb-server-{{ galera_major_version }}"
 # mariadb-galera-server and galera.
 galera_server_mariadb_distro_packages:
   - libmariadb-dev
-  - mariadb-client
+  - mariadb-client-{{ galera_major_version }}
   - mariadb-backup
   - "{{ galera_mariadb_server_package }}"
-  - galera-4
   - rsync
   - socat
 
 # The packages to uninstall during an upgrade from a previous version
 galera_server_upgrade_packages_remove:
-  - mariadb-server
+  - mariadb-server-*
   - mysql-common
 
 galera_debconf_items:
@@ -73,7 +74,7 @@ galera_debconf_items:
     vtype: "string"
 
 # Repositories
-_galera_repo_url: "http://repo.vexxhost.net/mariadb"
+_galera_repo_url: "http://{{ galera_repo_host }}/MariaDB/mariadb-{{ galera_major_version }}.{{ galera_minor_version }}/repo/{{ ansible_distribution | lower }}"
 _galera_repo:
   repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main"
   state: "present"
@@ -84,4 +85,4 @@ galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so"
 galera_client_distro_packages:
   - "mariadb-client-{{ galera_major_version }}"
 
-galera_unix_socket: "/var/run/mysqld/mysqld.sock"
\ No newline at end of file
+galera_unix_socket: "/var/run/mysqld/mysqld.sock"