From e1abdfc8bd1e64233b8d04feb726305ee5f901a1 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Tue, 24 Sep 2019 21:59:40 +0000
Subject: [PATCH] [nagios] remember to remove coloamer from nagios

---
 .../files/nagios/servicedeps/websitedeps.cfg  |  9 ------
 roles/nagios_server/tasks/main.yml            |  1 -
 .../templates/nagios/hostgroups/all.cfg.j2    |  2 +-
 .../nagios/hosts/coloamer-hosts.cfg.j2        | 32 -------------------
 .../nagios/hosts/gateway-hosts.cfg.j2         | 14 --------
 5 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 roles/nagios_server/templates/nagios/hosts/coloamer-hosts.cfg.j2

diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg
index b2129a23eb..405574ab61 100644
--- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg
+++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg
@@ -44,15 +44,6 @@ define servicedependency {
         execution_failure_criteria      w,c
 }
 
-define servicedependency {
-        host_name                      	67.203.2.67-coloamerica
-        service_description             https
-        dependent_host_name         	67.203.2.67-coloamerica
-        dependent_service_description   bodhi, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki
-        notification_failure_criteria   w,c
-        execution_failure_criteria      w,c
-}
-
 define servicedependency {
         host_name                       8.43.85.73-virthost-cc-rdu02
         service_description             http
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index d252b67da2..13de18b0c7 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -353,7 +353,6 @@
   template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
     - cloud-hosts.cfg
-    - coloamer-hosts.cfg
     - dedicatedsolutions-hosts.cfg
     - host1plus-hosts.cfg
     - gateway-hosts.cfg
diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
index 5b9eff8f82..8495d3c5c0 100644
--- a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2
@@ -24,7 +24,7 @@ define hostgroup{
 define hostgroup{
        hostgroup_name routers
        alias          routers
-       members        phx2-gw, ibiblio-gw, cloud-gw, coloamer-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw
+       members        phx2-gw, ibiblio-gw, cloud-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-gw
 }
 
 
diff --git a/roles/nagios_server/templates/nagios/hosts/coloamer-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/coloamer-hosts.cfg.j2
deleted file mode 100644
index 50a7e0c1cd..0000000000
--- a/roles/nagios_server/templates/nagios/hosts/coloamer-hosts.cfg.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-{% for host in groups['all']|sort %}
-{% if hostvars[host].datacenter == 'coloamer' and hostvars[host].nagios_Check_Services['ping'] == true %}
-define host {
-{% if vars['nagios_location'] == 'internal' %}
-   use                     defaulttemplate
-{% else %}
-  use                          mincheck
-{% endif %}
-
-   host_name               {{ host }}
-{% if hostvars[host].ansible_hostname is defined %}
-   alias                   {{ hostvars[host].ansible_hostname }}
-{% else %}
-   alias                   {{ host }}
-{% endif %}
-{% if hostvars[host].eth0_ip is defined %}
-   address                 {{ hostvars[host].eth0_ip }}
-{% elif hostvars[host].ansible_default_ipv4 is defined %}
-{% if hostvars[host].ansible_default_ipv4.address is defined %}
-   address                 {{ hostvars[host].ansible_default_ipv4.address }}
-{% endif %}
-{% else %}
-   address                 {{ host }}
-{% endif %}
-{% if hostvars[host]['vmhost'] is defined %}
-   parents                 {{ hostvars[host]['vmhost'] }}
-{% elif hostvars[host].datacenter is defined %}
-   parents                 coloamer-gw
-{% endif %}
-}
-{% endif %}
-{% endfor %}
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 216a932a59..3b7b6e90c5 100644
--- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
@@ -44,20 +44,6 @@ define host {
 {% endif %}
 }
 
-define host {
-  host_name                    coloamer-gw
-  alias                        coloamerica gateway
-  use                          mincheck
-  check_command                check-host-alive4
-  address                      67.203.2.65
-{% if vars['nagios_location'] == 'internal' %}
-  parents                      phx2-gw
-{% else %}
-  parents                      ibiblio-gw
-{% endif %}
-
-}
-
 #'dedicatedsolutions'
 define host {
   host_name                    dedicated-gw