From ace20e5603c1351eae2a11d0ccc65bee47c86fc4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 May 2020 16:38:16 -0700 Subject: [PATCH] iad2: clean up some hosts files and make sure bodhi-backend01.iad2 is actually in the iad2 datacenter Signed-off-by: Kevin Fenzi --- inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org | 2 ++ roles/hosts/files/bodhi2-hosts | 7 ------- .../files/github2fedmsg01.phx2.fedoraproject.org-hosts | 4 ---- roles/hosts/files/releng-hosts | 2 -- 4 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 roles/hosts/files/bodhi2-hosts delete mode 100644 roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts delete mode 100644 roles/hosts/files/releng-hosts diff --git a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org index b3cd497f59..dfa655b62f 100644 --- a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org @@ -13,6 +13,8 @@ num_cpus: 30 virt_install_command: "{{ virt_install_command_one_nic }}" +datacenter: iad2 + # These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/ bodhi_masher_enabled: True bodhi_updates_handler_enabled: False diff --git a/roles/hosts/files/bodhi2-hosts b/roles/hosts/files/bodhi2-hosts deleted file mode 100644 index c35223f762..0000000000 --- a/roles/hosts/files/bodhi2-hosts +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.23 infrastructure.fedoraproject.org -10.5.126.23 puppet.fedoraproject.org puppet infrastructure.fedoraproject.org -# sigul uses this for histerical reasons -10.5.125.71 sign-bridge1 -10.5.125.75 sign-vault1 diff --git a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts deleted file mode 100644 index e390dabb97..0000000000 --- a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts +++ /dev/null @@ -1,4 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.23 infrastructure.fedoraproject.org -10.5.126.71 db-github2fedmsg diff --git a/roles/hosts/files/releng-hosts b/roles/hosts/files/releng-hosts deleted file mode 100644 index 849c10d456..0000000000 --- a/roles/hosts/files/releng-hosts +++ /dev/null @@ -1,2 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6