From 2ad823eafd55bfbbe049a52b8ed410d22cf8e085 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 11 Aug 2021 18:41:01 +0100
Subject: [PATCH] Update galera to 10.5.12

Also remove vars/debian-11.yml so that bullseye takes packages from the official mariadb repo
rather than using the distro provided package.

Change-Id: I084f63d071394022b4b2dd6ad1433e4036adc978
---
 defaults/main.yml  |  2 +-
 vars/debian-11.yml | 85 ----------------------------------------------
 2 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 vars/debian-11.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index 9c2b7018..0ea34744 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,7 +43,7 @@ galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
 # The major version used to select the repo URL path
 galera_major_version: 10.5
-galera_minor_version: 9
+galera_minor_version: 12
 
 # Set the URL for the MariaDB repository
 galera_repo_host: "downloads.mariadb.com"
diff --git a/vars/debian-11.yml b/vars/debian-11.yml
deleted file mode 100644
index 02269be2..00000000
--- a/vars/debian-11.yml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-## APT Cache Options
-cache_timeout: 600
-
-# Default private device setting
-_galera_disable_privatedevices: yes
-
-# Galera GPG Keys
-_galera_gpg_keys: []
-
-galera_server_required_distro_packages:
-  - apt-transport-https
-  - debconf-utils
-  - libaio1
-  - libc6
-  - libgcc1
-  - libgcrypt20
-  - libstdc++6
-  - python3-pymysql # needed by mysql_user
-  - software-properties-common
-  - xinetd
-
-galera_etc_conf_file: "/etc/mysql/my.cnf"
-galera_etc_include_dir: "/etc/mysql/conf.d"
-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 }}"
-
-# NB This is specifically galera_server_mariadb_distro_packages as these
-# packages only get installed during the galera play - this is because of
-# the preseed task and the service startup control used when installing
-# mariadb-galera-server and galera.
-galera_server_mariadb_distro_packages:
-  - libmariadb-dev
-  - mariadb-client-{{ galera_major_version }}
-  - mariadb-backup
-  - "{{ galera_mariadb_server_package }}"
-  - rsync
-  - socat
-
-# The packages to uninstall during an upgrade from a previous version
-galera_server_upgrade_packages_remove:
-  - mariadb-server-*
-  - mariadb-common
-
-galera_debconf_items:
-  - question: "mysql-server/root_password"
-    name: "{{ galera_mariadb_server_package }}"
-    value: "{{ galera_root_password }}"
-    vtype: "string"
-  - question: "mysql-server/root_password_again"
-    name: "{{ galera_mariadb_server_package }}"
-    value: "{{ galera_root_password }}"
-    vtype: "string"
-
-# Repositories
-_galera_repo_url: ''
-_galera_repo: {}
-
-galera_wsrep_provider: "/usr/lib/galera/libgalera_smm.so"
-
-galera_client_distro_packages:
-  - "mariadb-client-{{ galera_major_version }}"
-
-galera_devel_distro_packages:
-  - libmariadb-dev
-
-galera_unix_socket: "/var/run/mysqld/mysqld.sock"