Merge "Set a var for the MariaDB major version"

defaults/main.yml

@@ -20,6 +20,9 @@ galera_root_user: root
 # Set the URL for the MariaDB repository
 galera_client_repo_url: "{{ galera_repo_url | default(_galera_client_repo_url) }}"
 
+# Set the major version to use for the galera repo
+galera_client_major_version: 10.1
+
 # Set the repo information for the MariaDB repository
 galera_client_repo: "{{ _galera_client_repo }}"
 

vars/redhat-7.yml

@@ -16,7 +16,7 @@
 # TODO(odyssey4me):
 # The use of 'galera_client_yum_repo_url' below is for backwards compatibility
 # to settings released in Newton. It can be removed in Queens.
-_galera_client_repo_url: "{{ galera_client_yum_repo_url | default('http://yum.mariadb.org/10.1/centos/7/x86_64') }}"
+_galera_client_repo_url: "{{ galera_client_yum_repo_url | default('http://yum.mariadb.org/' ~ galera_client_major_version ~ '/centos/7/x86_64') }}"
 _galera_client_repo:
   state: "present"
   name: MariaDB

vars/ubuntu-16.04.yml

@@ -17,7 +17,7 @@
 # TODO(odyssey4me):
 # The use of 'galera_client_apt_repo_url' below is for backwards compatibility
 # to settings released in Newton. It can be removed in Queens.
-_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://mirror.rackspace.com/mariadb/repo/10.1/ubuntu') }}"
+_galera_client_repo_url: "{{ galera_client_apt_repo_url | default('http://mirror.rackspace.com/mariadb/repo/' ~ galera_client_major_version ~ '/ubuntu') }}"
 _galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"
 
 galera_client_distro_packages:
@@ -31,7 +31,7 @@ galera_client_distro_packages:
   - libssl-dev
   - libstdc++6
   - mariadb-client
-  - mariadb-client-core-10.1
+  - "mariadb-client-core-{{ galera_client_major_version }}"
   - python-dev
 
 # Galera GPG Keys
@@ -40,4 +40,3 @@ _galera_client_gpg_keys:
     keyserver: 'hkp://keyserver.ubuntu.com:80'
     fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
     hash_id: '0xF1656F24C74CD1D8'
-