infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-09-30 00:24:23 +00:00
commit 85033667ff
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nagios_server/templates/nagios/hostgroups/nomail.cfg.j2
View file

@ -1,6 +1,6 @@
define hostgroup { define hostgroup {
hostgroup_name nomail hostgroup_name nomail
alias No Mail alias No Mail
members *, !status-fedora2, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %} members *, !status, !registry-cdn, !phx2-gw, !ibiblio-gw, !cloud-gw, !bodhost-gw, !coloamer-gw, !dedicated-gw, !host1plus-gw, !internetx-gw, !osuosl-gw, !rdu-gw, !rdu-cc-gw, !tummy-gw, !proxy05.fedoraproject.org, !mirrorlist-host1plus.fedoraproject.org, !download-rdu01.fedoraproject.org, !virthost-rdu01.fedoraproject.org, !fas3-01.stg.phx2.fedoraproject.org, !osbs-control01.phx2.fedoraproject.org, {% for host in groups['bastion'] %}!{{host}}, {% endfor %}{% for host in groups['smtp-mm'] %}!{{host}}, {% endfor %} {% for host in groups['builders'] %}!{{host}},{% endfor %} {% for host in groups['builders-stg'] %}!{{host}},{% endfor %} {% for host in groups['cloud'] %}!{{host}}, {% endfor %} {% for host in vars['phx2_management_limited'] %}!{{host}},{% endfor %} {% for host in vars['phx2_management_hosts'] %}!{{host}}{% if not loop.last %},{% endif %} {% endfor %}
} }

6
roles/nagios_server/templates/nagios/hosts/other.cfg.j2
View file

@ -1,8 +1,8 @@
define host { define host {
host_name status-fedora2 host_name status
alias status-fedora2.rhcloud.com alias status.fedoraproject.org
use mincheck use mincheck
address status-fedora2.rhcloud.com address d6tcqd4og8l21.cloudfront.net
{% if vars['nagios_location'] == 'internal' %} {% if vars['nagios_location'] == 'internal' %}
parents phx2-gw parents phx2-gw
{% else %} {% else %}

4
roles/nagios_server/templates/nagios/services/websites.cfg.j2
View file

@ -86,9 +86,9 @@ define service {
## Individual hosts ## Individual hosts
define service { define service {
host_name status-fedora2 host_name status
service_description http-status.fedoraproject.org service_description http-status.fedoraproject.org
check_command check_website!status-fedora2.rhcloud.com!/index.html!All systems go check_command check_website!d6tcqd4og8l21.cloudfront.net!/index.html!All systems go
use websitetemplate use websitetemplate
} }