Allow MariaDB gpg overrides without extra-vars

It may be required to override the gpg information
without being forced to use extra vars. This patch
allows that to be done.

Change-Id: I7b6d4ebba44ad3ac42ab5df219646525b1bd7b9f
This commit is contained in:
Jesse Pretorius 2017-08-09 10:49:06 +01:00 committed by Jean-Philippe Evrard
parent 5bf760a412
commit 9305bc7798
3 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -39,7 +39,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'

View File

@ -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'