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

Change these names too.

Browse source
This commit is contained in:
Ralph Bean 2014-11-17 15:05:40 +00:00
parent de194f9642
commit c8ef71fc22
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,47 +65,50 @@
- name: copy over our general collectd selinux module - name: copy over our general collectd selinux module
copy: src=selinux/fi-collectd.pp dest=/usr/share/collectd/fi-collectd.pp copy: src=selinux/fi-collectd.pp dest=/usr/share/collectd/fi-collectd.pp
register: selinux_module register: ficgeneral_module
tags: tags:
- collectd - collectd
- name: check to see if its even installed yet - name: check to see if its even installed yet
shell: semodule -l | grep fi-collectd shell: semodule -l | grep fi-collectd | wc -l
register: selinux_grep register: ficgeneral_grep
always_run: true always_run: true
changed_when: "1 != 1" changed_when: "'0' in ficgeneral_grep.stdout"
tags: tags:
- collectd - collectd
ignore_errors: True - selinux
- name: install our general collectd selinux module - name: install our general collectd selinux module
command: semodule -i /usr/share/collectd/fi-collectd.pp command: semodule -i /usr/share/collectd/fi-collectd.pp
when: selinux_module|changed or selinux_grep|failed when: ficgeneral_module|changed or ficgeneral_grep|changed
tags: tags:
- collectd - collectd
- selinux
- name: copy over our pstorefs/collectd selinux module (rhel6 has no pstorefs) - name: copy over our pstorefs/collectd selinux module (rhel6 has no pstorefs)
copy: src=selinux/fi-pstorefs.pp dest=/usr/share/collectd/fi-pstorefs.pp copy: src=selinux/fi-pstorefs.pp dest=/usr/share/collectd/fi-pstorefs.pp
when: ansible_distribution_major_version != '6' when: ansible_distribution_major_version != '6'
register: selinux_module register: ficpstorefs_module
tags: tags:
- collectd - collectd
- selinux
- name: check to see if its even installed yet - name: check to see if its even installed yet
shell: semodule -l | grep fi-pstorefs shell: semodule -l | grep fi-pstorefs
when: ansible_distribution_major_version != '6' when: ansible_distribution_major_version != '6'
register: selinux_grep register: ficpstorefs_grep
always_run: true always_run: true
changed_when: "1 != 1" changed_when: "1 != 1"
tags: tags:
- collectd - collectd
ignore_errors: True - selinux
- name: install our pstorefs/collectd selinux module - name: install our pstorefs/collectd selinux module
command: semodule -i /usr/share/collectd/fi-pstorefs.pp command: semodule -i /usr/share/collectd/fi-pstorefs.pp
when: ansible_distribution_major_version != '6' and (selinux_module|changed or selinux_grep|failed) when: ansible_distribution_major_version != '6' and (ficpstorefs_module|changed or ficpstorefs_grep|changed)
tags: tags:
- collectd - collectd
- selinux