diff --git a/inventory/group_vars/basset b/inventory/group_vars/basset index cd0c70bbe2..7443acec7b 100644 --- a/inventory/group_vars/basset +++ b/inventory/group_vars/basset @@ -5,10 +5,9 @@ mem_size: 4096 num_cpus: 2 custom_rules: [ - # fas01, fas02, and fas03 + # fas01, fas02 '-A INPUT -p tcp -m tcp -s 10.5.126.25 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.26 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.30 --dport 80 -j ACCEPT', # wiki01, wiki02 '-A INPUT -p tcp -m tcp -s 10.5.126.63 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.73 --dport 80 -j ACCEPT', diff --git a/inventory/host_vars/db-fas01.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.phx2.fedoraproject.org index e3df19fe75..9101c68990 100644 --- a/inventory/host_vars/db-fas01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.phx2.fedoraproject.org @@ -28,10 +28,9 @@ fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # Only allow postgresql access from the frontend nodes and hosted. # custom_rules: [ - # fas01, fas02, and fas03 + # fas01, fas02 '-A INPUT -p tcp -m tcp -s 10.5.126.25 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.26 --dport 5432 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 10.5.126.30 --dport 5432 -j ACCEPT', # ipsilon01 and ipsilon02 '-A INPUT -p tcp -m tcp -s 10.5.126.46 --dport 5432 -j ACCEPT', diff --git a/inventory/inventory b/inventory/inventory index f970c7f015..5c120449ef 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -377,7 +377,6 @@ elections01.stg.phx2.fedoraproject.org [fas] fas01.phx2.fedoraproject.org fas02.phx2.fedoraproject.org -fas03.phx2.fedoraproject.org [fas_stg] fas01.stg.phx2.fedoraproject.org @@ -1480,7 +1479,6 @@ fedocal02.phx2.fedoraproject.org nuancier01.phx2.fedoraproject.org pagure01.fedoraproject.org value01.phx2.fedoraproject.org -fas03.phx2.fedoraproject.org pkgs02.phx2.fedoraproject.org notifs-web01.phx2.fedoraproject.org wiki02.phx2.fedoraproject.org diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index e75e11f77c..4abbe9a85f 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -46,7 +46,6 @@ syncHttpLogs proxy110.phx2.fedoraproject.org syncHttpLogs proxy01.stg.phx2.fedoraproject.org syncHttpLogs fas01.phx2.fedoraproject.org syncHttpLogs fas02.phx2.fedoraproject.org -syncHttpLogs fas03.phx2.fedoraproject.org syncHttpLogs fas01.stg.phx2.fedoraproject.org syncHttpLogs fedocal01.phx2.fedoraproject.org syncHttpLogs fedocal02.phx2.fedoraproject.org diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2 index d975dd7e74..ae4cf2dd98 100644 --- a/roles/fas_server/templates/fas.cfg.j2 +++ b/roles/fas_server/templates/fas.cfg.j2 @@ -209,7 +209,7 @@ sqlalchemy.max_overflow=2 #sqlalchemy.pool_size=10 #sqlalchemy.max_overflow=25 -memcached_server = "fas01:11211,fas02:11211,fas03:11211" +memcached_server = "fas01:11211,fas02:11211" # Sending of email via TurboMail mail.on = True diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 3db10fa4da..f4cdf9d256 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -122,7 +122,6 @@ backend totpcgiprovision-backend server fas01 fas01:8444 check inter 5s rise 1 fall 2 {% if env == "production" %} server fas02 fas02:8444 check inter 5s rise 1 fall 2 - server fas03 fas03:8444 check inter 5s rise 1 fall 2 {% endif %} option httpchk GET /index.cgi diff --git a/roles/varnish/templates/proxies.vcl.j2 b/roles/varnish/templates/proxies.vcl.j2 index 48c73d643b..7d1096bad5 100644 --- a/roles/varnish/templates/proxies.vcl.j2 +++ b/roles/varnish/templates/proxies.vcl.j2 @@ -49,23 +49,10 @@ backend fas02 { } } -backend fas03 { - .host = "fas03"; - .port = "http"; - .probe = { - .url = "/accounts/"; - .interval = 5s; - .timeout = 5s; - .window = 5; - .threshold = 5; - } -} - sub vcl_init { new fas = directors.round_robin(); fas.add_backend(fas01); fas.add_backend(fas02); - fas.add_backend(fas03); } backend nuancier {