From 8a4ed2358aa714dd8b13ff34f503c95a6be4754d Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Wed, 20 Feb 2019 17:28:44 +0000 Subject: [PATCH] remove tummy01 everywhere Signed-off-by: Rick Elrod --- inventory/host_vars/tummy01.fedoraproject.org | 11 ------- .../unbound-tummy01.fedoraproject.org | 12 ------- inventory/inventory | 1 - roles/collectd/server/files/ping.conf | 3 +- roles/nagios_server/tasks/main.yml | 1 - .../templates/nagios/hostgroups/all.cfg.j2 | 2 +- .../nagios/hosts/gateway-hosts.cfg.j2 | 17 ---------- .../templates/nagios/hosts/tummy-hosts.cfg.j2 | 32 ------------------- 8 files changed, 3 insertions(+), 76 deletions(-) delete mode 100644 inventory/host_vars/tummy01.fedoraproject.org delete mode 100644 inventory/host_vars/unbound-tummy01.fedoraproject.org delete mode 100644 roles/nagios_server/templates/nagios/hosts/tummy-hosts.cfg.j2 diff --git a/inventory/host_vars/tummy01.fedoraproject.org b/inventory/host_vars/tummy01.fedoraproject.org deleted file mode 100644 index 9e1d116ea6..0000000000 --- a/inventory/host_vars/tummy01.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 -datacenter: tummy -nm: 255.255.255.240 -gw: 66.35.62.174 -dns: 198.49.126.1 -postfix_group: vpn -br0_ip: 66.35.62.161 -br0_nm: 255.255.255.248 -vpn: true diff --git a/inventory/host_vars/unbound-tummy01.fedoraproject.org b/inventory/host_vars/unbound-tummy01.fedoraproject.org deleted file mode 100644 index 1f3554e389..0000000000 --- a/inventory/host_vars/unbound-tummy01.fedoraproject.org +++ /dev/null @@ -1,12 +0,0 @@ ---- -nm: 255.255.255.240 -gw: 66.35.62.174 -dns: 198.49.126.1 66.35.36.133 -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_host -eth0_ip: 66.35.62.163 -eth0_nm: 255.255.255.248 -vmhost: tummy01.fedoraproject.org -datacenter: tummy -vpn: true diff --git a/inventory/inventory b/inventory/inventory index f76febc1b1..df9d1c63f1 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -140,7 +140,6 @@ ibiblio05.fedoraproject.org internetx01.fedoraproject.org osuosl01.fedoraproject.org osuosl02.fedoraproject.org -tummy01.fedoraproject.org virthost-rdu01.fedoraproject.org virthost-rdu02.fedoraproject.org virthost-cc-rdu01.fedoraproject.org diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf index bc22d81f1a..ac7f96df4e 100644 --- a/roles/collectd/server/files/ping.conf +++ b/roles/collectd/server/files/ping.conf @@ -1,7 +1,8 @@ LoadPlugin ping - Host "tummy01.fedoraproject.org" + Host "virthost-cc-rdu01.fedoraproject.org" + Host "virthost-cc-rdu02.fedoraproject.org" Host "osuosl01.fedoraproject.org" Host "ibiblio01.fedoraproject.org" Host "ibiblio02.fedoraproject.org" diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 5e1b4213ef..ee12380872 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -358,7 +358,6 @@ - other.cfg - rdu-cc-hosts.cfg - rdu-hosts.cfg - - tummy-hosts.cfg when: env == "production" tags: - nagios_server diff --git a/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all.cfg.j2 index e46d6c3897..5b9eff8f82 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, tummy-gw + members phx2-gw, ibiblio-gw, cloud-gw, coloamer-gw, dedicated-gw, host1plus-gw, internetx-gw, osuosl-gw, rdu-gw, rdu-cc-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 e0bffc0107..216a932a59 100644 --- a/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2 @@ -147,20 +147,3 @@ define host { {% endif %} } - -#'tummy' -define host { - host_name tummy-gw - alias tummy gateway - use mincheck - check_command check-host-alive4 - address 66.35.62.174 -{% if vars['nagios_location'] == 'internal' %} - parents phx2-gw -{% else %} - parents ibiblio-gw -{% endif %} - -} - - diff --git a/roles/nagios_server/templates/nagios/hosts/tummy-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/tummy-hosts.cfg.j2 deleted file mode 100644 index 6bbd737ee1..0000000000 --- a/roles/nagios_server/templates/nagios/hosts/tummy-hosts.cfg.j2 +++ /dev/null @@ -1,32 +0,0 @@ -{% for host in groups['all']|sort %} -{% if hostvars[host].datacenter == 'tummy' 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 tummy-gw -{% endif %} -} -{% endif %} -{% endfor %}