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

clean up nagios cloud to use cloud_phx2

Browse source
This commit is contained in:
Stephen Smoogen 2020-02-26 00:23:00 +00:00 • committed by Pierre-Yves Chibon
parent 3d7ff175d9
commit 68c936375e
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
inventory/cloud
View file

@ -1,4 +1,4 @@
[cloud] [cloud_phx2]
## ##
## Hardware ## Hardware
## ##
@ -50,16 +50,22 @@ developer.fedorainfracloud.org
fedora-bootstrap.fedorainfracloud.org fedora-bootstrap.fedorainfracloud.org
happinesspackets.fedorainfracloud.org happinesspackets.fedorainfracloud.org
happinesspackets-stg.fedorainfracloud.org happinesspackets-stg.fedorainfracloud.org
#iddev.fedorainfracloud.org
simple-koji-ci-prod.fedorainfracloud.org simple-koji-ci-prod.fedorainfracloud.org
ppc64le-test.fedorainfracloud.org ppc64le-test.fedorainfracloud.org
#rawhide-test.fedorainfracloud.org
#respins.fedorainfracloud.org
#telegram-irc.fedorainfracloud.org
#testdays.fedorainfracloud.org
upstreamfirst.fedorainfracloud.org upstreamfirst.fedorainfracloud.org
## ##
## New Community Hardware ## New Community Hardware
## ##
os-proxy01.fedorainfracloud.org os-proxy01.fedorainfracloud.org
os-proxy02.fedorainfracloud.org os-proxy02.fedorainfracloud.org
[cloud_external]
iddev.fedorainfracloud.org
rawhide-test.fedorainfracloud.org
respins.fedorainfracloud.org
telegram-irc.fedorainfracloud.org
testdays.fedorainfracloud.org
[cloud:children]
cloud_phx2
cloud_external

4
roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2
View file

@ -1,4 +1,4 @@
{% for host in groups['cloud']|sort %} {% for host in groups['cloud_phx2']|sort %}
define host { define host {
{% if hostvars[host].nagios_Check_Services['nrpe'] and vars['nagios_location'] == 'internal' %} {% if hostvars[host].nagios_Check_Services['nrpe'] and vars['nagios_location'] == 'internal' %}
use defaulttemplate use defaulttemplate
@ -14,7 +14,7 @@ define host {
{% if hostvars[host].eth0_ip is defined %} {% if hostvars[host].eth0_ip is defined %}
address {{ hostvars[host].eth0_ip }} address {{ hostvars[host].eth0_ip }}
{% elif hostvars[host].ansible_default_ipv4 is defined %} {% elif hostvars[host].ansible_default_ipv4 is defined %}
{% if hostvars[host].ansible_default_ipv4.address is defined and host not in groups['cloud'] %} {% if hostvars[host].ansible_default_ipv4.address is defined and host not in groups['cloud_phx2'] %}
address {{ hostvars[host].ansible_default_ipv4.address }} address {{ hostvars[host].ansible_default_ipv4.address }}
{% endif %} {% endif %}
{% else %} {% else %}