[repos] Make sure that the GPG keys are present before update the rep…

…ositories
uoi-io · Aug 6, 2016 · d7091c2 · d7091c2
1 parent 4bf85fe
commit d7091c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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