From e38f706eb1538446ab3bc23302eafa007e4890d3 Mon Sep 17 00:00:00 2001 From: "Jasper N. Brouwer" Date: Wed, 28 Jun 2017 21:47:20 +0200 Subject: [PATCH] Add variables for apt key-server and -ids --- defaults/main.yml | 2 ++ tasks/install/mariadb/upstream.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d657b1a..01c755d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -126,6 +126,8 @@ mysql_users: [] mysql_mariadb_version: '10.1' # See: https://downloads.mariadb.org/mariadb/repositories mysql_mariadb_repository: "http://ftp.igh.cnrs.fr/pub/mariadb/repo/{{ mysql_mariadb_version }}/debian" +mysql_mariadb_key_server: "keyserver.ubuntu.com" +mysql_mariadb_key_ids: ['0xcbcb082a1bb943db', '0xf1656f24c74cd1d8'] # ------------------------------------- # Percona diff --git a/tasks/install/mariadb/upstream.yml b/tasks/install/mariadb/upstream.yml index 7867fcc..12ad702 100644 --- a/tasks/install/mariadb/upstream.yml +++ b/tasks/install/mariadb/upstream.yml @@ -1,8 +1,8 @@ --- - name: APT | Install MariaDB key - apt_key: keyserver="keyserver.ubuntu.com" id={{ item }} state=present - with_items: ['0xcbcb082a1bb943db', '0xf1656f24c74cd1d8'] + apt_key: keyserver="{{ mysql_mariadb_key_server }}" id={{ item }} state=present + with_items: "{{ mysql_mariadb_key_ids }}" - name: APT | Add MariaDB repository apt_repository: repo='deb {{ mysql_mariadb_repository }} {{ ansible_distribution_release }} main' state=present