Fix epel-rpm-key

+ Remove hard reference to rpmkey
+ Do not use built-in moduel for rpm-key

Change-Id: Icc31bb470152029e213e159d083574278673b6a5

ansible/install/group_vars/all.yml

@@ -78,7 +78,8 @@ dns_server: 8.8.8.8
 disable_ssh_dns: false
 
 # epel7 rpm for collectd packages
-epel7_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+epel7_rpm: https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+epel7_rpmkey: https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
 
 # Extra Repos to add during collectd install
 repos:

ansible/install/roles/epel/defaults/main.yml

@@ -1,2 +1,3 @@
 # epel7 rpm for collectd packages
-epel7_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+epel7_rpm: https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+epel7_rpmkey: https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7

ansible/install/roles/epel/tasks/main.yml

@@ -10,13 +10,12 @@
 # The fedoraproject CDN has problems somtimes, this will keep trying
 #  for up to 10 minutes before failing.
 - name: Import EPEL GPG Key
-  rpm_key: key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
-    state=present
+  shell: rpm --import {{ epel7_rpmkey }}
   become: true
   register: import_result
-  until: import_result|success
+  until: "import_result.rc==0"
   retries: 10
-  delay: 60
+  delay: 10
 
 # Same as above but with the Centos CDN
 - name: Check for EPEL repo
@@ -25,5 +24,5 @@
   register: install_result
   until: install_result|success
   retries: 10
-  delay: 60
+  delay: 10
   notify: remove_epel