commit 7075e72c654b87870364c85ee2677a164f55afca
Author: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date:   Tue Jul 21 09:53:59 2020 +0100

    Update galera to 10.5.6
    
    This is the first stable release from the 10.5 series.
    
    Depends-On: https://review.opendev.org/758399
    Change-Id: I76438e6519eac09be7f9729de3cefb4130f72dea

diff --git a/defaults/main.yml b/defaults/main.yml
index f2c55e7..64c3a4c 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_major_version: 10.5
+galera_minor_version: 6
 
 # Set the URL for the MariaDB repository
 galera_repo_host: "downloads.mariadb.com"
diff --git a/vars/debian.yml b/vars/debian.yml
index 28517e3..5873225 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -33,7 +33,6 @@ galera_server_required_distro_packages:
   - libgcc1
   - libgcrypt20
   - libstdc++6
-  - python-pymysql # needed by mysql_user
   - python3-pymysql # needed by mysql_user
   - software-properties-common
   - xinetd
diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml
deleted file mode 100644
index 664089e..0000000
--- a/vars/ubuntu-20.04.yml
+++ /dev/null
@@ -1,87 +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:
-  - url: http://repo.vexxhost.net/mariadb/key.gpg
-
-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
-  - 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
-  - mysql-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: "http://repo.vexxhost.net/mariadb"
-_galera_repo:
-  repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main"
-  state: "present"
-  filename: "MariaDB"
-
-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