From 1ccadafd1b0cb6ca9defcd533d122318a5ae7a48 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Feb 23 2020 17:21:00 +0000 Subject: copr is not in the cloud and this is messing up nagios complicated templates. --- diff --git a/inventory/cloud b/inventory/cloud index 0cc7799..ed828b3 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -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 diff --git a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 index 1038224..5ea8966 100644 --- a/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/cloud-hosts.cfg.j2 @@ -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