From 458fc8813bda03b76d1db04d2c0ce2b5e7d8e92a Mon Sep 17 00:00:00 2001
From: Mark O Brien <markobri@redhat.com>
Date: Thu, 19 May 2022 15:34:50 +0100
Subject: [PATCH] move proxy09 to aws

Signed-off-by: Mark O Brien <markobri@redhat.com>
---
 inventory/cloud                               |  1 +
 inventory/host_vars/proxy09.fedoraproject.org | 52 +++----------------
 inventory/inventory                           |  4 +-
 roles/batcave/files/allows                    |  1 +
 4 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/inventory/cloud b/inventory/cloud
index ee6eb5f86a..7058600892 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -8,6 +8,7 @@
 #copr-vmhost01.fedorainfracloud.org
 
 [cloud_aws]
+proxy09.fedoraproject.org
 proxy30.fedoraproject.org
 proxy31.fedoraproject.org
 proxy32.fedoraproject.org
diff --git a/inventory/host_vars/proxy09.fedoraproject.org b/inventory/host_vars/proxy09.fedoraproject.org
index ccc8bd18a2..ddd3fc56af 100644
--- a/inventory/host_vars/proxy09.fedoraproject.org
+++ b/inventory/host_vars/proxy09.fedoraproject.org
@@ -1,49 +1,13 @@
 ---
-datacenter: osuosl
-dns1: 8.8.8.8
-dns2: 8.8.4.4
-dns_search1: "vpn.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-eth0_ipv4: 140.211.169.206
-eth0_ipv4_gw: 140.211.169.193
-eth0_ipv4_nm: 26
-eth0_ipv6: "2605:bc80:3010:600:dead:beef:cafe:feda"
-eth0_ipv6_gw: "2605:bc80:3010:600::1"
-eth0_ipv6_nm: 64
-freezes: true
-has_ipv4: yes
-has_ipv6: yes
-ks_repo: http://38.145.60.16/pub/fedora/linux/releases/35/Server/x86_64/os/
-ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
-mac0: 52:54:00:67:b2:6f
-max_mem_size: 20000
-mem_size: 16384
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
-        - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-        - 2001:4860:4860::8888
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-      gateway6: "{{ eth0_ipv6_gw }}"
-    mac: "{{ mac0 }}"
-    name: eth0
-    type: ethernet
+# Skipping all the network stuff. Amazon does that all via DHCP.
+
+# This is consumed by the roles/fedora-web/main role
+datacenter: aws
+nagios_Check_Services:
+  swap: false
 nrpe_procs_crit: 1400
 nrpe_procs_warn: 1200
-num_cpus: 8
 postfix_group: vpn
-public_hostname: proxy09.fedoraproject.org
-# This is consumed by the roles/fedora-web/main role
-sponsor: osuosl
-vmhost: osuosl02.fedoraproject.org
-volgroup: /dev/vg_guests
+public_ip: 35.81.0.97
+sponsor: amazon
 vpn: true
diff --git a/inventory/inventory b/inventory/inventory
index 8d0fa6076b..990a9f48a8 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -337,7 +337,7 @@ proxy05.fedoraproject.org
 proxy06.fedoraproject.org
 #proxy07.fedoraproject.org
 #proxy08.fedoraproject.org
-#proxy09.fedoraproject.org
+proxy09.fedoraproject.org
 proxy10.iad2.fedoraproject.org
 proxy11.fedoraproject.org
 proxy12.fedoraproject.org
@@ -511,7 +511,7 @@ proxy05.fedoraproject.org
 proxy06.fedoraproject.org
 #proxy07.fedoraproject.org
 #proxy08.fedoraproject.org
-#proxy09.fedoraproject.org
+proxy09.fedoraproject.org
 proxy10.iad2.fedoraproject.org
 proxy11.fedoraproject.org
 proxy12.fedoraproject.org
diff --git a/roles/batcave/files/allows b/roles/batcave/files/allows
index ef61054b18..db60b57725 100644
--- a/roles/batcave/files/allows
+++ b/roles/batcave/files/allows
@@ -180,6 +180,7 @@ require ip 18.136.235.60
 require ip 54.233.149.99
 require ip 34.209.19.54
 require ip 35.88.180.155
+require ip 35.81.0.97
 #
 # We put this at the end because it fails for hosts with no reverse dns
 # and then they don't check the rest of the ip allows.