Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2016-12-01 18:59:02 +00:00
commit 9f8b97be50
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/backups
View file

@ -19,7 +19,7 @@ db-koji01.phx2.fedoraproject.org
copr-be.cloud.fedoraproject.org copr-be.cloud.fedoraproject.org
copr-fe.cloud.fedoraproject.org copr-fe.cloud.fedoraproject.org
copr-keygen.cloud.fedoraproject.org copr-keygen.cloud.fedoraproject.org
#copr-dist-git.fedorainfracloud.org copr-dist-git.fedorainfracloud.org
value01.phx2.fedoraproject.org value01.phx2.fedoraproject.org
taiga.fedorainfracloud.org taiga.fedorainfracloud.org
taskotron01.qa.fedoraproject.org taskotron01.qa.fedoraproject.org

12
roles/collectd/base/tasks/main.yml
View file

@ -49,13 +49,21 @@
when: inventory_hostname.startswith('log') when: inventory_hostname.startswith('log')
# apache - localhost only - pretty much any apache server # apache - localhost only - pretty much any apache server
- name: install collectd-apache - name: install collectd-apache (yum)
yum: state=present name=collectd-apache yum: state=present name=collectd-apache
tags: tags:
- collectd - collectd
notify: notify:
- restart collectd - 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 - name: /etc/collectd/apache.conf
copy: src=apache.conf dest=/etc/collectd.d/apache.conf copy: src=apache.conf dest=/etc/collectd.d/apache.conf