Revert "Instead of a custom task, use epel_customizationj"

This reverts commit 375eaa9ed4.

inventory/group_vars/all

@@ -13,7 +13,7 @@ libdir: /usr/lib64
 # Most EL systems need default EPEL repos.
 # Some systems (notably fed-cloud*) need to get their own
 # EPEL files because EPEL overrides packages in their core repos.
-epel_customization: none
+use_default_epel: true
 
 # example of ports for default iptables
 # tcp_ports: [ 22, 80, 443 ]

inventory/group_vars/cloud-hardware

@@ -1,4 +1,4 @@
 ---
 freezes: false
 
-epel_customization: cloud
+use_default_epel: false

roles/cloud_compute/tasks/main.yml

@@ -4,6 +4,10 @@
 - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}"
 - template: src={{ files }}/fedora-cloud/hosts dest=/etc/hosts owner=root mode=0644
 
+- name: Copy customized EPEL7 repo
+  copy: src=cloud-epel7.repo dest=/etc/yum.repos.d/cloud-epel7.repo
+        owner=root group=root mode=0644
+
 - name: Enable nested virtualization
   copy: content="options kvm_intel nested=1" dest=/etc/modprobe.d/nested_virt.conf
         owner=root group=root mode=0644

tasks/yumrepos.yml

@@ -8,11 +8,8 @@
   - yumrepos
 
 - name: put epel repos on el systems
-  action: copy src="{{ item }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
-  when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
-  with_first_found:
-  - {{ files }}/common/epel{{ epel_customization }}.repo
-  - {{ files }}/common/epel{{ ansible_distribution_major_version }}.repo
+  action: copy src="{{ files }}/common/epel{{ ansible_distribution_major_version }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo"
+  when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel)
   tags:
   - config
   - packages