From 0b4c0f4fd7b83659656ea76b11101ae090e5eeab Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Thu, 14 Sep 2017 15:17:42 -0500
Subject: [PATCH] Set a var for the MariaDB major version

Setting a custom MariaDB mirror URL is very tedious to maintain
because operators must ensure they update the overridden repo
URL every time the major version changes within the galera role.

This will allow operators to set overrides for their local mirror
like:

galera_repo_url: "http://mirror.mydomain.com/mariadb/repo/{{ galera_major_version }}/ubuntu"

Change-Id: Ie5dd27b8cffff5245724ecc79e79272086bf3b30
(cherry picked from commit 039ece94a002ca3f0f70c7b35b1303a9a8aee473)
---
 defaults/main.yml     | 3 +++
 vars/redhat-7.yml     | 2 +-
 vars/ubuntu-16.04.yml | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7f75487e..e21453fc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,6 +43,9 @@ galera_debconf_items: []
 galera_server_percona_distro_packages: []
 galera_mariadb_server_package: "{{ _galera_mariadb_server_package }}"
 
+# The major version used to select the repo URL path
+galera_major_version: 10.1
+
 # Set the URL for the MariaDB repository
 galera_repo_url: "{{ _galera_repo_url }}"
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 4c1e45cb..11cbde0d 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -44,7 +44,7 @@ galera_server_upgrade_packages_remove:
   - MariaDB-Galera-server
   - MariaDB-server
 
-_galera_repo_url: "http://yum.mariadb.org/10.1/centos/7/x86_64"
+_galera_repo_url: "http://yum.mariadb.org/{{ galera_major_version }}/centos/7/x86_64"
 _galera_repo:
   name: MariaDB
   description: "MariaDB Repo"
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 8932ba0c..6fcf36aa 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -42,7 +42,7 @@ galera_server_required_distro_packages:
 # 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-10.1"
+_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
@@ -96,7 +96,7 @@ _galera_percona_xtrabackup_repo:
   state: "present"
   filename: "Percona"
 
-_galera_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu"
+_galera_repo_url: "http://mirror.rackspace.com/mariadb/repo/{{ galera_major_version }}/ubuntu"
 _galera_repo:
   repo: "deb {{ galera_repo_url }} {{ ansible_distribution_release }} main"
   state: "present"