From d7091c29dd05eb89096755849b70bab6b4159e2d Mon Sep 17 00:00:00 2001 From: goldyfruit Date: Sat, 6 Aug 2016 17:59:54 -0400 Subject: [PATCH] [repos] Make sure that the GPG keys are present before update the repositories --- tasks/repos/CentOS.yml | 7 +++---- tasks/repos/Debian.yml | 12 ++++++------ tasks/repos/RedHat.yml | 7 +++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tasks/repos/CentOS.yml b/tasks/repos/CentOS.yml index 3eb9dac..00c50b2 100644 --- a/tasks/repos/CentOS.yml +++ b/tasks/repos/CentOS.yml @@ -10,11 +10,10 @@ state=present - name: Install Percona repository (CentOS) +- rpm_key: + key=https://www.percona.com/downloads/RPM-GPG-KEY-percona + state=present package: name={{ item }} state=present with_items: "{{ percona_package }}" - -- rpm_key: - key=https://www.percona.com/downloads/RPM-GPG-KEY-percona - state=present diff --git a/tasks/repos/Debian.yml b/tasks/repos/Debian.yml index b9a7539..0a6b270 100644 --- a/tasks/repos/Debian.yml +++ b/tasks/repos/Debian.yml @@ -1,19 +1,19 @@ --- # file: roles/galera/tasks/repos/Debian.yml - name: Install MariaDB Galera repository (Debian) +- apt_key: + keyserver=keyserver.ubuntu.com id=0xcbcb082a1bb943db + state=present apt_repository: repo='deb http://mariadb.mirror.iweb.com/repo/10.1/debian jessie main' state=present update_cache=yes -- apt_key: - keyserver=keyserver.ubuntu.com id=0xcbcb082a1bb943db - state=present - name: Install Percona repository (Debian) +- apt_key: + keyserver=keys.gnupg.net id=1C4CBDCDCD2EFD2A + state=present apt_repository: repo='deb http://repo.percona.com/apt jessie main' state=present update_cache=yes -- apt_key: - keyserver=keys.gnupg.net id=1C4CBDCDCD2EFD2A - state=present diff --git a/tasks/repos/RedHat.yml b/tasks/repos/RedHat.yml index 46eabde..d96b963 100644 --- a/tasks/repos/RedHat.yml +++ b/tasks/repos/RedHat.yml @@ -20,11 +20,10 @@ yum-config-manager --enable rhel-7-server-extras-rpms - name: Install Percona repository (RedHat) +- rpm_key: + key=https://www.percona.com/downloads/RPM-GPG-KEY-percona + state=present package: name={{ item }} state=present with_items: "{{ percona_package }}" - -- rpm_key: - key=https://www.percona.com/downloads/RPM-GPG-KEY-percona - state=present