From 90c28879f99e8a88c26b67c8034bfaf548094098 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 30 Jun 2020 17:55:12 -0700 Subject: [PATCH] nagios_server: Adjust ns01/02 to try and work with nagios external Also adjust gateway group as ibiblio-gw can't be it's own parent. Also setup vpn hosts also on external as it needs the hostgroup. Signed-off-by: Kevin Fenzi --- inventory/inventory | 4 ++-- roles/nagios_server/tasks/main.yml | 1 + .../nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index c4cd8d7220..dbf6f40015 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -393,8 +393,8 @@ ns05.fedoraproject.org ns13.rdu2.fedoraproject.org [dns_external] -ns01.iad2.fedoraproject.org -ns02.iad2.fedoraproject.org +ns-iad01.iad2.fedoraproject.org +ns-iad02.iad2.fedoraproject.org ns02.fedoraproject.org ns05.fedoraproject.org diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 7467d85bba..49df4a5508 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -467,6 +467,7 @@ template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root with_items: - all-external.cfg + - vpnclients.cfg when: nagios_location == "external" tags: - nagios_server diff --git a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 index 95b0b60b70..f3ad3bbae0 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -13,7 +13,6 @@ define host { parents iad2-gw {% elif vars['nagios_location'] == 'external' %} address 66.187.228.248 - parents ibiblio-gw {% endif %} }