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

copr is not in the cloud and this is messing up nagios complicated templates.

Browse source
This commit is contained in:
Stephen Smoogen 2020-02-23 17:21:00 +00:00 • committed by Pierre-Yves Chibon
parent 77fca5cf79
commit 3a2cdba4bb
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
inventory/cloud
View file

@ -39,17 +39,6 @@ arm03-packager01.cloud.fedoraproject.org
arm03-qa00.cloud.fedoraproject.org
arm03-qa01.cloud.fedoraproject.org
cloud-noc01.cloud.fedoraproject.org
copr-be.cloud.fedoraproject.org
#copr-be-dev.cloud.fedoraproject.org
copr-be-stg.fedorainfracloud.org
copr-dist-git.fedorainfracloud.org
#copr-dist-git-dev.fedorainfracloud.org
copr-dist-git-stg.fedorainfracloud.org
copr-fe.cloud.fedoraproject.org
copr-fe-dev.cloud.fedoraproject.org
copr-keygen.cloud.fedoraproject.org
#copr-keygen-dev.cloud.fedoraproject.org
copr-keygen-stg.fedorainfracloud.org
developer.fedorainfracloud.org
el6-test.fedorainfracloud.org
el7-test.fedorainfracloud.org

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

@ -1,6 +1,4 @@
{% for host in groups['cloud']|sort %}
{% if host.startswith('copr') and vars['nagios_location'] == 'external' %}
{% else %}
define host {
{% if hostvars[host].nagios_Check_Services['nrpe'] and vars['nagios_location'] == 'internal' %}
use defaulttemplate