Merge "Allow MariaDB gpg overrides without extra-vars"

defaults/main.yml

@@ -23,6 +23,9 @@ 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 }}"
 
+# Set the gpg keys needed to be imported
+galera_client_gpg_keys: "{{ _galera_client_gpg_keys | default([]) }}"
+
 ## APT Cache Options
 cache_timeout: 600
 

vars/redhat-7.yml

@@ -40,7 +40,7 @@ galera_client_distro_packages:
   - python-devel
 
 # Galera GPG Keys
-galera_client_gpg_keys:
+_galera_client_gpg_keys:
   - key_name: 'RPM-GPG-KEY-MariaDB'
     keyserver: 'https://yum.mariadb.org'
     fallback_keyserver: 'http://yum.mariadb.org'

vars/ubuntu-16.04.yml

@@ -35,7 +35,7 @@ galera_client_distro_packages:
   - python-dev
 
 # Galera GPG Keys
-galera_client_gpg_keys:
+_galera_client_gpg_keys:
   - key_name: 'mariadb'
     keyserver: 'hkp://keyserver.ubuntu.com:80'
     fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'