diff --git a/inventory/inventory b/inventory/inventory index 6087fd2f39..472d8ec953 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -107,10 +107,6 @@ blockerbugs02.phx2.fedoraproject.org [blockerbugs-stg] blockerbugs01.stg.phx2.fedoraproject.org -[bodhi2] -bodhi03.phx2.fedoraproject.org -bodhi04.phx2.fedoraproject.org - [bodhi2-stg] bodhi01.stg.phx2.fedoraproject.org diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 0e64b0b8d8..43b62d62f2 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -67,8 +67,6 @@ syncHttpLogs elections01.stg.phx2.fedoraproject.org syncHttpLogs tagger01.phx2.fedoraproject.org syncHttpLogs tagger02.phx2.fedoraproject.org syncHttpLogs tagger01.stg.phx2.fedoraproject.org -syncHttpLogs bodhi03.phx2.fedoraproject.org -syncHttpLogs bodhi04.phx2.fedoraproject.org syncHttpLogs bodhi01.stg.phx2.fedoraproject.org syncHttpLogs packages03.phx2.fedoraproject.org syncHttpLogs packages04.phx2.fedoraproject.org diff --git a/roles/basessh/files/syncHttpLogs.sh b/roles/basessh/files/syncHttpLogs.sh index 0e64b0b8d8..43b62d62f2 100644 --- a/roles/basessh/files/syncHttpLogs.sh +++ b/roles/basessh/files/syncHttpLogs.sh @@ -67,8 +67,6 @@ syncHttpLogs elections01.stg.phx2.fedoraproject.org syncHttpLogs tagger01.phx2.fedoraproject.org syncHttpLogs tagger02.phx2.fedoraproject.org syncHttpLogs tagger01.stg.phx2.fedoraproject.org -syncHttpLogs bodhi03.phx2.fedoraproject.org -syncHttpLogs bodhi04.phx2.fedoraproject.org syncHttpLogs bodhi01.stg.phx2.fedoraproject.org syncHttpLogs packages03.phx2.fedoraproject.org syncHttpLogs packages04.phx2.fedoraproject.org diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 59922945b9..0bae0c56d2 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -119,10 +119,7 @@ frontend bodhi2-frontend backend bodhi2-backend balance hdr(appserver) -{% if env == "production" %} - server bodhi03 bodhi03:80 check inter 20s rise 2 fall 3 - server bodhi04 bodhi04:80 check inter 20s rise 2 fall 3 -{% else %} +{% if env == "staging" %} server bodhi01 bodhi01:80 check inter 20s rise 2 fall 3 {% endif %} option httpchk GET /