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

move nagios ipa file to template to make less phx2 dependent

Browse source
This commit is contained in:
Stephen Smoogen 2020-05-21 14:57:41 -04:00
parent 8802fc1823
commit df9fcb477d
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nagios_server/tasks/main.yml
View file

@ -193,7 +193,6 @@
- file_age.cfg - file_age.cfg
- fmn.cfg - fmn.cfg
- haproxy.cfg - haproxy.cfg
- ipa.cfg
- koji.cfg - koji.cfg
- koschei.cfg - koschei.cfg
- locking.cfg - locking.cfg
@ -326,6 +325,7 @@
- name: Template over services (internal) - name: Template over services (internal)
template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
with_items: with_items:
- ipa.cfg
- phx2-mgmt.cfg - phx2-mgmt.cfg
- mirrorlist-proxies.cfg - mirrorlist-proxies.cfg
when: env == "production" and nagios_location == "internal" when: env == "production" and nagios_location == "internal"

2
roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
View file

@ -1,7 +1,7 @@
define servicegroup { define servicegroup {
servicegroup_name freemedia servicegroup_name freemedia
alias FreeMedia alias FreeMedia
members {% for host in groups['sundries'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal{% if not loop.last %}, {% endif %}{% endif %} {% endfor %} members {% for host in groups['sundries']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal{% if not loop.last %}, {% endif %}{% endif %} {% endfor %}
} }

2
roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
View file

@ -1,6 +1,4 @@
define servicegroup { define servicegroup {
servicegroup_name ipa servicegroup_name ipa
alias IPA Servers alias IPA Servers
members {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, IPA Replication Status{% if not loop.last %}, {% endif %}{% endif%}{% endfor %}
} }

3
roles/nagios_server/files/nagios/services/ipa.cfg → roles/nagios_server/templates/nagios/services/ipa.cfg.j2
View file

@ -1,6 +1,7 @@
define service { define service {
host_name ipa01.phx2.fedoraproject.org,ipa02.phx2.fedoraproject.org host_name {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}},{% endif%}{% endfor %}
service_description IPA Replication Status service_description IPA Replication Status
check_command check_by_nrpe!check_ipa_replication check_command check_by_nrpe!check_ipa_replication
use lighttemplate use lighttemplate
servicegroups ipa
} }