From d9f206c408bee503f9432a4f156dba0a66b0a409 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 13 Oct 2015 17:01:22 +0000 Subject: [PATCH] Remove special cases for proxy01/proxy10 now, since we have dns PHX2 zone --- roles/hosts/files/arm.fedoraproject.org-hosts | 5 ----- roles/hosts/files/ask01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/ask02.phx2.fedoraproject.org-hosts | 1 - .../autocloud-backend-libvirt.phx2.fedoraproject.org-hosts | 1 - .../autocloud-backend-vbox.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/autosign-hosts | 3 --- .../files/badges-backend01.phx2.fedoraproject.org-hosts | 1 - .../hosts/files/badges-web01.phx2.fedoraproject.org-hosts | 1 - .../hosts/files/badges-web02.phx2.fedoraproject.org-hosts | 1 - .../files/bodhi-backend01.phx2.fedoraproject.org-hosts | 3 --- roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/bodhi2-hosts | 3 --- .../files/docs-backend01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/elections01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/elections02.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts | 2 -- roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts | 2 -- .../files/github2fedmsg01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/koji01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/koji02.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/kojibuilder-hosts | 1 - roles/hosts/files/koschei01.phx2.fedoraproject.org-hosts | 1 - .../files/notifs-backend01.phx2.fedoraproject.org-hosts | 1 - .../hosts/files/notifs-web01.phx2.fedoraproject.org-hosts | 1 - .../hosts/files/notifs-web02.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/packages03.phx2.fedoraproject.org-hosts | 2 -- .../files/packages03.stg.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/packages04.phx2.fedoraproject.org-hosts | 2 -- roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts | 2 -- roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts | 2 -- roles/hosts/files/qa.fedoraproject.org-hosts | 7 ------- roles/hosts/files/releng-hosts | 1 - roles/hosts/files/secondary-hosts | 5 ----- roles/hosts/files/sign-hosts | 1 - .../hosts/files/summershum01.phx2.fedoraproject.org-hosts | 1 - .../files/sundries01.stg.phx2.fedoraproject.org-hosts | 3 --- roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts | 1 - roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts | 1 - .../hosts/files/taskotron-stg01.qa.fedoraproject.org-hosts | 7 ------- roles/hosts/files/value01.phx2.fedoraproject.org-hosts | 1 - 45 files changed, 79 deletions(-) diff --git a/roles/hosts/files/arm.fedoraproject.org-hosts b/roles/hosts/files/arm.fedoraproject.org-hosts index e00e53f45c..d5f3863cdc 100644 --- a/roles/hosts/files/arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm.fedoraproject.org-hosts @@ -6,8 +6,3 @@ 10.5.124.138 arm.koji.fedoraproject.org 10.5.124.138 armpkgs.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -# -# This is proxy01.phx2.fedoraproject.org -# -10.5.126.51 mirrors.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts index ab21ee2887..aeb0ab5222 100644 --- a/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-ask diff --git a/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts index ab21ee2887..aeb0ab5222 100644 --- a/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-ask diff --git a/roles/hosts/files/autocloud-backend-libvirt.phx2.fedoraproject.org-hosts b/roles/hosts/files/autocloud-backend-libvirt.phx2.fedoraproject.org-hosts index c273ebd4b5..92a1828f7c 100644 --- a/roles/hosts/files/autocloud-backend-libvirt.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/autocloud-backend-libvirt.phx2.fedoraproject.org-hosts @@ -2,7 +2,6 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -10.5.126.51 download.fedora.redhat.com 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/autocloud-backend-vbox.phx2.fedoraproject.org-hosts b/roles/hosts/files/autocloud-backend-vbox.phx2.fedoraproject.org-hosts index c273ebd4b5..92a1828f7c 100644 --- a/roles/hosts/files/autocloud-backend-vbox.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/autocloud-backend-vbox.phx2.fedoraproject.org-hosts @@ -2,7 +2,6 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -10.5.126.51 download.fedora.redhat.com 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/autosign-hosts b/roles/hosts/files/autosign-hosts index 75dc6fad24..145cd62218 100644 --- a/roles/hosts/files/autosign-hosts +++ b/roles/hosts/files/autosign-hosts @@ -2,9 +2,7 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -10.5.126.51 download.fedora.redhat.com 10.5.126.27 archives.fedoraproject.org 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org @@ -19,5 +17,4 @@ 10.5.124.145 secondary-signer 10.5.124.138 arm.koji.fedoraproject.org 10.5.124.138 armpkgs.fedoraproject.org -10.5.126.51 apps.fedoraproject.org diff --git a/roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts index 4285fdc6e6..10b9bee55a 100644 --- a/roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 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.51 admin.fedoraproject.org 10.5.126.111 db-datanommer db-datanommer02 10.5.126.71 db-tahrir db-tahrir diff --git a/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts index 8794e3afd6..168d44af1c 100644 --- a/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts @@ -1,5 +1,4 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-tahrir db-tahrir diff --git a/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts index 9f784a6208..168d44af1c 100644 --- a/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts @@ -1,5 +1,4 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-tahrir db-tahrir diff --git a/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts index 4ed95ad92d..206ff9a25c 100644 --- a/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts @@ -2,14 +2,11 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org # sigul uses this for histerical reasons 10.5.125.71 sign-bridge1 10.5.125.75 sign-vault1 -# proxy10 is fun! -10.5.126.51 proxy10.phx2.fedoraproject.org admin.fedoraproject.org bodhi.fedoraproject.org id.fedoraproject.org # we need internal ips for these for owner sync 10.5.125.63 koji.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org diff --git a/roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts index c8f9f414d9..a68f2bdd9e 100644 --- a/roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts @@ -2,6 +2,5 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts index c8f9f414d9..a68f2bdd9e 100644 --- a/roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts @@ -2,6 +2,5 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/bodhi2-hosts b/roles/hosts/files/bodhi2-hosts index 5b5b632d54..92dc197847 100644 --- a/roles/hosts/files/bodhi2-hosts +++ b/roles/hosts/files/bodhi2-hosts @@ -2,11 +2,8 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org # sigul uses this for histerical reasons 10.5.125.71 sign-bridge1 10.5.125.75 sign-vault1 -# proxy10 is fun! -10.5.126.51 proxy10.phx2.fedoraproject.org admin.fedoraproject.org bodhi.fedoraproject.org id.fedoraproject.org diff --git a/roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts index c5d8a790d0..b8a5186d5f 100644 --- a/roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts @@ -2,5 +2,4 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org kojipkgs diff --git a/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts index d2c0f25a6a..8fc8f66135 100644 --- a/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-elections db-elections diff --git a/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts index d2c0f25a6a..8fc8f66135 100644 --- a/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-elections db-elections diff --git a/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts index 5e9ad46e04..534bac056f 100644 --- a/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts index 6fa17dd6ab..cdb5140659 100644 --- a/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts @@ -1,8 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-fedocal db-fedocal diff --git a/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts index 6fa17dd6ab..cdb5140659 100644 --- a/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts @@ -1,8 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-fedocal db-fedocal diff --git a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts index ede502a56e..e390dabb97 100644 --- a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts @@ -1,5 +1,4 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-github2fedmsg diff --git a/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts index 5e9ad46e04..534bac056f 100644 --- a/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts index 73bc285357..a14c51884f 100644 --- a/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.phx2.fedoraproject.org-hosts @@ -5,4 +5,3 @@ 10.5.125.36 kojipkgs.fedoraproject.org 10.5.124.182 ppc.koji.fedoraproject.org 10.5.124.191 s390.koji.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts index 73bc285357..a14c51884f 100644 --- a/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji02.phx2.fedoraproject.org-hosts @@ -5,4 +5,3 @@ 10.5.125.36 kojipkgs.fedoraproject.org 10.5.124.182 ppc.koji.fedoraproject.org 10.5.124.191 s390.koji.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/kojibuilder-hosts b/roles/hosts/files/kojibuilder-hosts index f2e91ca5ec..7a4f7311b1 100644 --- a/roles/hosts/files/kojibuilder-hosts +++ b/roles/hosts/files/kojibuilder-hosts @@ -1,7 +1,6 @@ 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.51 mirrors.fedoraproject.org admin.fedoraproject.org # primary koji infra 10.5.125.63 koji.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/koschei01.phx2.fedoraproject.org-hosts b/roles/hosts/files/koschei01.phx2.fedoraproject.org-hosts index cd2b645259..1b060c2598 100644 --- a/roles/hosts/files/koschei01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koschei01.phx2.fedoraproject.org-hosts @@ -1,5 +1,4 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.36 kojipkgs.fedoraproject.org diff --git a/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts index b74480ad5e..08f1097fd7 100644 --- a/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts index 9a533828fe..2b7b70ff67 100644 --- a/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts index 92bc2456cf..2b7b70ff67 100644 --- a/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts index b7b332c4b2..5dbf0f7073 100644 --- a/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 nuancier_db nuancier_db diff --git a/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts index b7b332c4b2..5dbf0f7073 100644 --- a/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 nuancier_db nuancier_db diff --git a/roles/hosts/files/packages03.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.phx2.fedoraproject.org-hosts index c15362e025..d0696a69da 100644 --- a/roles/hosts/files/packages03.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.phx2.fedoraproject.org-hosts @@ -12,5 +12,3 @@ 10.5.126.23 lockbox01.phx2.fedoraproject.org infrastructure.fedoraproject.org 10.5.124.191 s390.koji.fedoraproject.org 10.5.124.182 ppc.koji.fedoraproject.org -10.5.126.51 apps.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index 7212fa20a0..89bae01216 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -2,7 +2,6 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.23 puppet.fedoraproject.org puppet puppet01 puppet01.phx2.fedoraproject.org -10.5.126.51 admin.fedoraproject.org 10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org pkgs pkgs01 10.5.126.81 app01.phx2.fedoraproject.org app1 app3 app5 bapp1 app01 app03 app05 bapp01 bapp02 diff --git a/roles/hosts/files/packages04.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages04.phx2.fedoraproject.org-hosts index b4e2bdbf73..52e466420b 100644 --- a/roles/hosts/files/packages04.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages04.phx2.fedoraproject.org-hosts @@ -11,5 +11,3 @@ 10.5.126.23 lockbox01.phx2.fedoraproject.org infrastructure.fedoraproject.org 10.5.124.191 s390.koji.fedoraproject.org 10.5.124.182 ppc.koji.fedoraproject.org -10.5.126.51 apps.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts index e21dbf743d..4ebf0714f6 100644 --- a/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts @@ -1,8 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org diff --git a/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts index e21dbf743d..4ebf0714f6 100644 --- a/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts @@ -1,8 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org diff --git a/roles/hosts/files/qa.fedoraproject.org-hosts b/roles/hosts/files/qa.fedoraproject.org-hosts index 814d94869a..addeb6b43b 100644 --- a/roles/hosts/files/qa.fedoraproject.org-hosts +++ b/roles/hosts/files/qa.fedoraproject.org-hosts @@ -4,13 +4,6 @@ 10.5.125.36 kojipkgs.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -# -# This is proxy10.phx2.fedoraproject.org -# -10.5.126.52 mirrors.fedoraproject.org -10.5.126.52 admin.fedoraproject.org -10.5.126.52 hub.fedoraproject.org -10.5.126.52 bodhi.fedoraproject.org # for VPN 10.5.126.12 gateway.phx2.fedoraproject.org gateway bastion01.phx2.fedoraproject.org bastion01 diff --git a/roles/hosts/files/releng-hosts b/roles/hosts/files/releng-hosts index 9db5ed50ea..3ca3552a4e 100644 --- a/roles/hosts/files/releng-hosts +++ b/roles/hosts/files/releng-hosts @@ -5,4 +5,3 @@ 10.5.125.36 kojipkgs.fedoraproject.org 10.5.124.138 arm.koji.fedoraproject.org armpkgs.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -10.5.126.51 mirrors.fedoraproject.org admin.fedoraproject.org diff --git a/roles/hosts/files/secondary-hosts b/roles/hosts/files/secondary-hosts index e00e53f45c..d5f3863cdc 100644 --- a/roles/hosts/files/secondary-hosts +++ b/roles/hosts/files/secondary-hosts @@ -6,8 +6,3 @@ 10.5.124.138 arm.koji.fedoraproject.org 10.5.124.138 armpkgs.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -# -# This is proxy01.phx2.fedoraproject.org -# -10.5.126.51 mirrors.fedoraproject.org -10.5.126.51 admin.fedoraproject.org diff --git a/roles/hosts/files/sign-hosts b/roles/hosts/files/sign-hosts index 08b0ea71ba..40bbd15766 100644 --- a/roles/hosts/files/sign-hosts +++ b/roles/hosts/files/sign-hosts @@ -1,7 +1,6 @@ 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.51 admin.fedoraproject.org # # Here for historical reasons due to cert names. # diff --git a/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts b/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts index e4b43a6cd4..b4e3214753 100644 --- a/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts @@ -1,6 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.71 db-summershum db-summershum diff --git a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts index f018a86108..ac7c874e90 100644 --- a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts @@ -13,6 +13,3 @@ # For translations 209.132.182.79 fedora.zanata.org - -# For datagrepper queries of AMIs (from prod) -10.5.126.51 apps.fedoraproject.org proxy10 diff --git a/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts index 498dbaa2cf..33c0123cf5 100644 --- a/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org apps.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts index 498dbaa2cf..33c0123cf5 100644 --- a/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts @@ -1,7 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org apps.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/taskotron-stg01.qa.fedoraproject.org-hosts b/roles/hosts/files/taskotron-stg01.qa.fedoraproject.org-hosts index cc297c9115..addeb6b43b 100644 --- a/roles/hosts/files/taskotron-stg01.qa.fedoraproject.org-hosts +++ b/roles/hosts/files/taskotron-stg01.qa.fedoraproject.org-hosts @@ -4,13 +4,6 @@ 10.5.125.36 kojipkgs.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org pkgs -# -# This is proxy10.phx2.fedoraproject.org -# -10.5.126.51 mirrors.fedoraproject.org -10.5.126.51 admin.fedoraproject.org -10.5.126.51 hub.fedoraproject.org -10.5.126.51 bodhi.fedoraproject.org # for VPN 10.5.126.12 gateway.phx2.fedoraproject.org gateway bastion01.phx2.fedoraproject.org bastion01 diff --git a/roles/hosts/files/value01.phx2.fedoraproject.org-hosts b/roles/hosts/files/value01.phx2.fedoraproject.org-hosts index 11ce2bc2ae..304c55a086 100644 --- a/roles/hosts/files/value01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/value01.phx2.fedoraproject.org-hosts @@ -2,5 +2,4 @@ ::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 -10.5.126.51 admin.fedoraproject.org 10.5.125.63 koji.fedoraproject.org