From 530c06d70defaa69a13459b81eea29c53e2b3f4b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 2 Jun 2022 12:53:50 -0700
Subject: [PATCH] internetx01: goodbye, farewell, amen

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 .../host_vars/internetx01.fedoraproject.org   | 42 -------------------
 inventory/host_vars/ns05.fedoraproject.org    |  2 +-
 inventory/inventory                           |  1 -
 roles/collectd/server/files/ping.conf         |  2 +-
 4 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 inventory/host_vars/internetx01.fedoraproject.org

diff --git a/inventory/host_vars/internetx01.fedoraproject.org b/inventory/host_vars/internetx01.fedoraproject.org
deleted file mode 100644
index a09c771918..0000000000
--- a/inventory/host_vars/internetx01.fedoraproject.org
+++ /dev/null
@@ -1,42 +0,0 @@
----
-br0_ipv4: 85.236.55.4
-br0_ipv4_gw: 85.236.55.1
-br0_ipv4_nm: 28
-br0_ipv6: 2001:4178:2:1269::10
-br0_ipv6_gw: 2001:4178:2:1269::1
-br0_ipv6_nm: 64
-br0_port0_mac: '{{ mac0 }}'
-datacenter: internetx
-dns1: 8.8.8.8
-dns_search1: fedoraproject.org
-dns_search2: vpn.fedoraproject.org
-has_ipv4: true
-has_ipv6: true
-mac0: 00:26:b9:89:62:5e
-network_connections:
-  - autoconnect: true
-    ip:
-      address:
-        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
-        - '{{ br0_ipv6 }}/{{ br0_ipv6_nm }}'
-      dhcp4: false
-      dns:
-        - '{{ dns1 }}'
-      dns_search:
-        - '{{ dns_search1 }}'
-        - '{{ dns_search2 }}'
-      gateway4: '{{ br0_ipv4_gw }}'
-      gateway6: '{{ br0_ipv6_gw }}'
-    name: br0
-    state: up
-    type: bridge
-  - mac: '{{ br0_port0_mac }}'
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-nrpe_procs_crit: 1000
-nrpe_procs_warn: 900
-postfix_group: vpn
-virthost: true
-vpn: true
diff --git a/inventory/host_vars/ns05.fedoraproject.org b/inventory/host_vars/ns05.fedoraproject.org
index 1739764e2c..6c1b68e605 100644
--- a/inventory/host_vars/ns05.fedoraproject.org
+++ b/inventory/host_vars/ns05.fedoraproject.org
@@ -4,7 +4,7 @@ csi_relationship: |
   It serves about every domain under fedoraproject, fedo*, as well as others, both forward and reverse.
 
   * This host relies on:
-  - The virthost it's hosted on (internetx01.fedoraproject.org)
+  - The virthost it's hosted on (internetx02.fedoraproject.org)
   - batcave for dns git and keys
   - connectivity to maxmind to create geoIP dns acl
 
diff --git a/inventory/inventory b/inventory/inventory
index b038b5f65f..37791d3633 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -96,7 +96,6 @@ dedicatedsolutions01.fedoraproject.org
 ibiblio01.fedoraproject.org
 #ibiblio04.fedoraproject.org
 ibiblio05.fedoraproject.org
-internetx01.fedoraproject.org
 internetx02.fedoraproject.org
 osuosl01.fedoraproject.org
 virthost-rdu01.fedoraproject.org
diff --git a/roles/collectd/server/files/ping.conf b/roles/collectd/server/files/ping.conf
index a29360cf98..8294424c63 100644
--- a/roles/collectd/server/files/ping.conf
+++ b/roles/collectd/server/files/ping.conf
@@ -8,5 +8,5 @@ LoadPlugin ping
     Host "ibiblio02.fedoraproject.org"
     Host "ibiblio04.fedoraproject.org"
     Host "osuosl03.fedoraproject.org"
-    Host "internetx01.fedoraproject.org"
+    Host "internetx02.fedoraproject.org"
 </Plugin>