Allow MariaDB repo overrides without extra-vars

It may be required to override the repo information
in its entirety, rather than just the URL. This
patch allows that to be done.

Change-Id: Ic7e77f0a442a82a424e75a9d79c9c6116818cfc1

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 repo information for the MariaDB repository
+galera_client_repo: "{{ _galera_client_repo }}"
+
 ## APT Cache Options
 cache_timeout: 600
 

tasks/galera_client_install_zypper.yml

@@ -20,6 +20,6 @@
       repo: "{{ item.uri }}"
       auto_import_keys: yes
   register: zypper_repository_added
-  with_items: "{{ galera_client_zypper_repo }}"
+  with_items: "{{ galera_client_repo }}"
   tags:
     - galera-repos

vars/redhat-7.yml

@@ -17,7 +17,7 @@
 # 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:
+_galera_client_repo:
   state: "present"
   name: MariaDB
   description: "MariaDB Repo"

vars/suse-42.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 _galera_client_repo_url: "http://download.opensuse.org/repositories/server:/database/openSUSE_Leap_{{ ansible_distribution_version }}"
-galera_client_zypper_repo:
+_galera_client_repo:
   - name: "OBS:server_database"
     uri: "{{ galera_client_repo_url }}"
 

vars/ubuntu-16.04.yml

@@ -18,7 +18,7 @@
 # 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: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"
+_galera_client_repo: "deb {{ galera_client_repo_url }} {{ ansible_distribution_release }} main"
 
 galera_client_distro_packages:
   - build-essential