diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index b79b4b1919..117d510c81 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -149,7 +149,6 @@ phx2_external: - proxy10.fedoraproject.org - puppet.fedoraproject.org - retrace01.fedoraproject.org - - retrace02.fedoraproject.org - secondary01.fedoraproject.org - secondarykoji.fedoraproject.org - stg.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index ae8f6edd9f..e3f2b61d36 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -43,8 +43,6 @@ composer.stg.phx2.fedoraproject.org [retrace] retrace01.qa.fedoraproject.org -[retrace-stg] -#retrace02.qa.fedoraproject.org [repospanner] repospanner01.phx2.fedoraproject.org @@ -819,7 +817,6 @@ rabbitmq01.stg.phx2.fedoraproject.org rabbitmq02.stg.phx2.fedoraproject.org rabbitmq03.stg.phx2.fedoraproject.org resultsdb-stg01.qa.fedoraproject.org -#retrace02.qa.fedoraproject.org el8betatest01.stg.phx2.fedoraproject.org sign-bridge01.stg.phx2.fedoraproject.org sundries01.stg.phx2.fedoraproject.org @@ -950,7 +947,6 @@ zanata2fedmsg01.phx2.fedoraproject.org # - filter_plugins/fedmsg.py [fedmsg-qa-network] retrace01.qa.fedoraproject.org -#retrace02.qa.fedoraproject.org resultsdb01.qa.fedoraproject.org openqa01.qa.fedoraproject.org openqa-ppc64le-01.qa.fedoraproject.org diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index d11019895e..cdb558a0f4 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -27,9 +27,7 @@ config = dict( # FAF/retrace is on the qa network and talks to an inbound relay. ("shell.retrace01", "shell-retrace01.qa.fedoraproject.org"), - ("shell.retrace02", "shell-retrace02.qa.fedoraproject.org"), ("faf.retrace01", "faf-retrace01.qa.fedoraproject.org"), - ("faf.retrace02", "faf-retrace02.qa.fedoraproject.org"), # This is for the copr backend, which is a little different. The # "cert-prefix" is just "copr", and is hardcoded in diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index ce12921b76..ca7fc85264 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -360,17 +360,6 @@ backend oci-registry-backend {% if env == "staging" %} -frontend retrace-frontend - bind 0.0.0.0:10049 - default_backend retrace-backend - -backend retrace-backend - balance hdr(appserver) - server retrace02.qa.fedoraproject.org retrace02.qa.fedoraproject.org:80 check inter 10s rise 1 fall 2 - -{% endif %} -{% if env == "staging" %} - frontend faf-frontend bind 0.0.0.0:10050 default_backend faf-backend