From 8ef433c8f6aa474574a89a5fe60722b566413f60 Mon Sep 17 00:00:00 2001
From: Greg Sutcliffe <fedora@emeraldreverie.org>
Date: Wed, 3 Jun 2026 16:02:51 +0100
Subject: [PATCH] Nagios: Remove rdu-cc-gw

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>
---
 .../templates/nagios/hostgroups/all-rdu3.cfg.j2     |  2 +-
 .../templates/nagios/hostgroups/all.cfg.j2          |  2 +-
 .../templates/nagios/hosts/gateway-hosts.cfg.j2     | 13 -------------
 .../templates/nagios/hosts/rdu-cc-hosts.cfg.j2      |  2 --
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2
index 271e16c197..6c92221ab5 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all-rdu3.cfg.j2
@@ -35,5 +35,5 @@ define hostgroup{
 define hostgroup{
        hostgroup_name routers
        alias          routers
-       members        ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, rdu3-gw
+       members        ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu3-gw
 }
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 89f613b922..679dcaa1e3 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -40,7 +40,7 @@ define hostgroup{
 define hostgroup{
        hostgroup_name routers
        alias          routers
-       members        ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw, rdu3-gw
+       members        ibiblio-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu3-gw
 }
 
 
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 be2bd414e1..04bc135fa0 100644
--- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
@@ -106,18 +106,5 @@ define host {
 
 }
 
-#'rdu-cc'
-define host {
-  host_name                    rdu-cc-gw
-  alias                        rdu community cage gateway
-  use                          mincheck
-  check_command                check-host-alive4
-  address                      8.43.85.254
-{% if vars['nagios_location'] == 'rdu3_internal' %}
-  parents                      rdu3-gw
-{% elif vars['nagios_location'] == 'external' %}
-  parents                      ibiblio-gw
-{% endif %}
-
 }
 
diff --git a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
index b94a77c222..eb05ba9603 100644
--- a/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/rdu-cc-hosts.cfg.j2
@@ -24,8 +24,6 @@ define host {
 {% endif %}
 {% if hostvars[host]['vmhost'] is defined %}
    parents                 {{ hostvars[host]['vmhost'] }}
-{% elif hostvars[host].datacenter is defined %}
-   parents                 rdu-cc-gw
 {% endif %}
 }
 {% endif %}