From 515bec4165b211ae7f5b7cfc3cfcd10b793d358d Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Mon, 27 Feb 2023 11:46:00 +0100
Subject: [PATCH] Upgrade MariaDB to 10.11

10.11 is the next LTS release of MariaDB which has been released
recently. Let's switch to using new LTS from 10.6 that we're using
for quite a while now.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/879069
Change-Id: I430acf61fd4fdacdead19d0c5cc2765e017eb3c7
---
 defaults/main.yml | 4 ++--
 vars/debian.yml   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d2eb99a8..7969aa21 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,8 +43,8 @@ galera_mariadb_service_name: mariadb
 galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
 # The major version used to select the repo URL path
-galera_major_version: 10.6
-galera_minor_version: 10
+galera_major_version: 10.11
+galera_minor_version: 2
 
 # Set the URL for the MariaDB repository
 galera_repo_host: "downloads.mariadb.com"
diff --git a/vars/debian.yml b/vars/debian.yml
index 94f4bbd8..56e74372 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -43,7 +43,7 @@ galera_var_run_socket: "/var/run/mysqld/mysqld.sock"
 # The package name for mariaDB is set as a variable
 # so that it can be used in debconf later in the
 # "galera_common" role.
-_galera_mariadb_server_package: "mariadb-server-{{ galera_major_version }}"
+_galera_mariadb_server_package: "mariadb-server"
 
 # NB This is specifically galera_server_mariadb_distro_packages as these
 # packages only get installed during the galera play - this is because of
@@ -51,7 +51,7 @@ _galera_mariadb_server_package: "mariadb-server-{{ galera_major_version }}"
 # mariadb-galera-server and galera.
 galera_server_mariadb_distro_packages:
   - libmariadb-dev
-  - mariadb-client-{{ galera_major_version }}
+  - mariadb-client
   - mariadb-backup
   - "{{ galera_mariadb_server_package }}"
   - rsync
@@ -59,7 +59,7 @@ galera_server_mariadb_distro_packages:
 
 # The packages to uninstall during an upgrade from a previous version
 galera_server_upgrade_packages_remove:
-  - mariadb-server-*
+  - mariadb-server*
   - mariadb-common
 
 galera_debconf_items:
@@ -82,7 +82,7 @@ _galera_repo:
 galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so"
 
 galera_client_distro_packages:
-  - "mariadb-client-{{ galera_major_version }}"
+  - "mariadb-client"
 
 galera_devel_distro_packages:
   - libmariadb-dev