Use epel when approiate

Don't install epel7 when using rhel8, only for rhel7.
Remove this patch once Centos 8 becaomes available.

Change-Id: I10a35c6201c0282f7de8fb969b608a1604581e5e
Signed-off-by: Charles Short <chucks@redhat.com>

ansible/install/collectd-generic.yml

@@ -15,7 +15,7 @@
   vars:
     config_type: baremetal
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - collectd-generic
   tags: baremetal
   environment: "{{proxy_env}}"
@@ -25,7 +25,7 @@
   vars:
     config_type: guest
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - collectd-generic
   tags: guest
   environment: "{{proxy_env}}"
@@ -35,7 +35,7 @@
   vars:
     config_type: graphite
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - collectd-generic
   tags: graphite
   environment: "{{proxy_env}}"

ansible/install/collectd-openstack.yml

@@ -22,7 +22,7 @@
     config_type: undercloud
   roles:
     - { role: common, when: collectd_undercloud }
-    - { role: epel, when: collectd_undercloud }
+    - { role: epel, when: collectd_undercloud and ansible_distribution_major_version == '7'}
     - { role: repo }
     - { role: collectd-openstack, when: collectd_undercloud }
   tasks:
@@ -41,7 +41,7 @@
   roles:
     - { role: osp_version }
     - { role: common, when: collectd_controller }
-    - { role: epel, when: collectd_controller }
+    - { role: epel, when: collectd_controller and ansible_distribution_major_version == '7'}
     - { role: repo }
     - { role: collectd-openstack, when: collectd_controller }
   tasks:
@@ -59,7 +59,7 @@
     config_type: networker
   roles:
     - { role: common, when: collectd_networker }
-    - { role: epel, when: collectd_networker }
+    - { role: epel, when: collectd_networker and ansible_distribution_major_version == '7'}
     - { role: repo }
     - { role: collectd-openstack, when: collectd_networker }
   tasks:
@@ -77,7 +77,7 @@
     config_type: blockstorage
   roles:
     - { role: common, when: collectd_blockstorage }
-    - { role: epel, when: collectd_blockstorage }
+    - { role: epel, when: collectd_blockstorage ansible_distribution_major_version == '7' }
     - { role: repo }
     - { role: collectd-openstack, when: collectd_blockstorage }
   tasks:
@@ -95,7 +95,7 @@
     config_type: objectstorage
   roles:
     - { role: common, when: collectd_objectstorage }
-    - { role: epel, when: collectd_objectstorage }
+    - { role: epel, when: collectd_objectstorage ansible_distribution_major_version == '7' }
     - { role: repo }
     - { role: collectd-openstack, when: collectd_objectstorage }
   tasks:
@@ -113,7 +113,7 @@
     config_type: cephstorage
   roles:
     - { role: common, when: collectd_cephstorage }
-    - { role: epel, when: collectd_cephstorage }
+    - { role: epel, when: collectd_cephstorage and ansible_distribution_major_version == '7'}
     - { role: repo }
     - { role: collectd-openstack, when: collectd_cephstorage }
   tasks:
@@ -132,7 +132,7 @@
   roles:
     - { role: osp_version }
     - { role: common, when: collectd_compute }
-    - { role: epel, when: collectd_compute }
+    - { role: epel, when: collectd_compute and ansible_distribution_major_version == '7'}
     - { role: repo }
     - { role: collectd-openstack, when: collectd_compute }
   tasks:

ansible/install/grafana.yml

@@ -6,6 +6,6 @@
 - hosts: grafana
   remote_user: root
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - grafana
   environment: "{{proxy_env}}"

ansible/install/graphite.yml

@@ -6,6 +6,6 @@
 - hosts: graphite
   remote_user: root
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - graphite
   environment: "{{proxy_env}}"

ansible/install/statsd.yml

@@ -5,6 +5,6 @@
 - hosts: statsd
   remote_user: root
   roles:
-    - epel
+    - {role: epel, when: ansible_distribution_major_version == '7'}
     - statsd-install
   environment: "{{proxy_env}}"