Cloud needs special EPEL7 repo files

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

inventory/group_vars/all

@@ -10,6 +10,11 @@ nested: false
 # Used to install various nagios scripts and the like.
 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.
+use_default_epel: true
+
 # example of ports for default iptables
 # tcp_ports: [ 22, 80, 443 ]
 # udp_ports: [ 110, 1024, 2049 ]

inventory/group_vars/cloud-hardware

@@ -1,2 +1,4 @@
 ---
 freezes: false
+
+use_default_epel: false

roles/cloud_compute/files/cloud-epel7.repo

@@ -0,0 +1,21 @@
+[epel]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/7/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+includepkgs=nagios-plugins*,rkhunter
+
+[epel-testing]
+name=Extras Packages for Enterprise Linux $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/testing/7/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+
+[epel-beta]
+name=Extras Packages for Enterprise Linux beta $releasever - $basearch
+baseurl=http://infrastructure.fedoraproject.org/pub/epel/beta/7/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=http://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7

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

@@ -9,7 +9,7 @@
 
 - name: put epel repos on el systems
   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')
+  when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel)
   tags:
   - config
   - packages