diff --git a/inventory/backups b/inventory/backups index 787c351b70..29997df377 100644 --- a/inventory/backups +++ b/inventory/backups @@ -19,7 +19,7 @@ db-koji01.phx2.fedoraproject.org copr-be.cloud.fedoraproject.org copr-fe.cloud.fedoraproject.org copr-keygen.cloud.fedoraproject.org -#copr-dist-git.fedorainfracloud.org +copr-dist-git.fedorainfracloud.org value01.phx2.fedoraproject.org taiga.fedorainfracloud.org taskotron01.qa.fedoraproject.org diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index c1da408d79..51aa4ed7c2 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -49,13 +49,21 @@ when: inventory_hostname.startswith('log') # apache - localhost only - pretty much any apache server -- name: install collectd-apache +- name: install collectd-apache (yum) yum: state=present name=collectd-apache tags: - collectd notify: - restart collectd - when: collectd_apache + when: collectd_apache and ansible_distribution_major_version|int < 22 + +- name: install collectd-apache (dnf) + dnf: state=present name=collectd-apache + tags: + - collectd + notify: + - restart collectd + when: collectd_apache and ansible_distribution_major_version|int > 21 - name: /etc/collectd/apache.conf copy: src=apache.conf dest=/etc/collectd.d/apache.conf