From 2ba4ffad4503156c4c262e06e95fe4668668c119 Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Tue, 30 Apr 2024 10:57:16 +0200 Subject: [PATCH 1/2] Add variable to set apt-key keyserver --- defaults/main.yml | 2 ++ tasks/repository.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3bc9bea..c7dcc8c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -59,3 +59,5 @@ percona_server_zoneinfo_tz_name: '' percona_server_zoneinfo_command: "mysql_tzinfo_to_sql {{ percona_server_zoneinfo_tz_dir }}" percona_server_toolkit_udfs_manage: true + +apt_key_keyserver: keyserver.ubuntu.com diff --git a/tasks/repository.yml b/tasks/repository.yml index b4febd6..3fe0abe 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -13,7 +13,7 @@ - name: repository | add public key ansible.builtin.apt_key: id: 9334A25F8507EFA5 - keyserver: keyserver.ubuntu.com + keyserver: "{{ apt_key_keyserver }}" state: present tags: - percona-server-repository-public-key From 870c37a04445e633639049b17762377d1f52160c Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Wed, 1 May 2024 15:01:15 +0200 Subject: [PATCH 2/2] Consistency changes --- defaults/main.yml | 2 -- tasks/repository.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c7dcc8c..3bc9bea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -59,5 +59,3 @@ percona_server_zoneinfo_tz_name: '' percona_server_zoneinfo_command: "mysql_tzinfo_to_sql {{ percona_server_zoneinfo_tz_dir }}" percona_server_toolkit_udfs_manage: true - -apt_key_keyserver: keyserver.ubuntu.com diff --git a/tasks/repository.yml b/tasks/repository.yml index 3fe0abe..5c5017f 100644 --- a/tasks/repository.yml +++ b/tasks/repository.yml @@ -13,7 +13,7 @@ - name: repository | add public key ansible.builtin.apt_key: id: 9334A25F8507EFA5 - keyserver: "{{ apt_key_keyserver }}" + keyserver: "{{ apt_key_keyserver | default('keyserver.ubuntu.com') }}" state: present tags: - percona-server-repository-public-key