infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

remove fas03 from inventory and a LOT of config files where it was hard-coded

Browse source
This commit is contained in:
Stephen Smoogen 2019-05-23 22:53:51 +00:00
parent 0464c8aa97
commit 658a22035b
7 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/basset
View file

@ -5,10 +5,9 @@ mem_size: 4096
num_cpus: 2 num_cpus: 2
custom_rules: [ 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.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.26 --dport 80 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 10.5.126.30 --dport 80 -j ACCEPT',
# wiki01, wiki02 # 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.63 --dport 80 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 10.5.126.73 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.73 --dport 80 -j ACCEPT',

3
inventory/host_vars/db-fas01.phx2.fedoraproject.org
View file

@ -28,10 +28,9 @@ fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran
# Only allow postgresql access from the frontend nodes and hosted. # Only allow postgresql access from the frontend nodes and hosted.
# #
custom_rules: [ 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.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.26 --dport 5432 -j ACCEPT',
'-A INPUT -p tcp -m tcp -s 10.5.126.30 --dport 5432 -j ACCEPT',
# ipsilon01 and ipsilon02 # ipsilon01 and ipsilon02
'-A INPUT -p tcp -m tcp -s 10.5.126.46 --dport 5432 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.46 --dport 5432 -j ACCEPT',

2
inventory/inventory
View file

@ -377,7 +377,6 @@ elections01.stg.phx2.fedoraproject.org
[fas] [fas]
fas01.phx2.fedoraproject.org fas01.phx2.fedoraproject.org
fas02.phx2.fedoraproject.org fas02.phx2.fedoraproject.org
fas03.phx2.fedoraproject.org
[fas_stg] [fas_stg]
fas01.stg.phx2.fedoraproject.org fas01.stg.phx2.fedoraproject.org
@ -1480,7 +1479,6 @@ fedocal02.phx2.fedoraproject.org
nuancier01.phx2.fedoraproject.org nuancier01.phx2.fedoraproject.org
pagure01.fedoraproject.org pagure01.fedoraproject.org
value01.phx2.fedoraproject.org value01.phx2.fedoraproject.org
fas03.phx2.fedoraproject.org
pkgs02.phx2.fedoraproject.org pkgs02.phx2.fedoraproject.org
notifs-web01.phx2.fedoraproject.org notifs-web01.phx2.fedoraproject.org
wiki02.phx2.fedoraproject.org wiki02.phx2.fedoraproject.org

1
roles/base/files/syncHttpLogs.sh
View file

@ -46,7 +46,6 @@ syncHttpLogs proxy110.phx2.fedoraproject.org
syncHttpLogs proxy01.stg.phx2.fedoraproject.org syncHttpLogs proxy01.stg.phx2.fedoraproject.org
syncHttpLogs fas01.phx2.fedoraproject.org syncHttpLogs fas01.phx2.fedoraproject.org
syncHttpLogs fas02.phx2.fedoraproject.org syncHttpLogs fas02.phx2.fedoraproject.org
syncHttpLogs fas03.phx2.fedoraproject.org
syncHttpLogs fas01.stg.phx2.fedoraproject.org syncHttpLogs fas01.stg.phx2.fedoraproject.org
syncHttpLogs fedocal01.phx2.fedoraproject.org syncHttpLogs fedocal01.phx2.fedoraproject.org
syncHttpLogs fedocal02.phx2.fedoraproject.org syncHttpLogs fedocal02.phx2.fedoraproject.org

2
roles/fas_server/templates/fas.cfg.j2
View file

@ -209,7 +209,7 @@ sqlalchemy.max_overflow=2
#sqlalchemy.pool_size=10 #sqlalchemy.pool_size=10
#sqlalchemy.max_overflow=25 #sqlalchemy.max_overflow=25
memcached_server = "fas01:11211,fas02:11211,fas03:11211" memcached_server = "fas01:11211,fas02:11211"
# Sending of email via TurboMail # Sending of email via TurboMail
mail.on = True mail.on = True

1
roles/haproxy/templates/haproxy.cfg
View file

@ -122,7 +122,6 @@ backend totpcgiprovision-backend
server fas01 fas01:8444 check inter 5s rise 1 fall 2 server fas01 fas01:8444 check inter 5s rise 1 fall 2
{% if env == "production" %} {% if env == "production" %}
server fas02 fas02:8444 check inter 5s rise 1 fall 2 server fas02 fas02:8444 check inter 5s rise 1 fall 2
server fas03 fas03:8444 check inter 5s rise 1 fall 2
{% endif %} {% endif %}
option httpchk GET /index.cgi option httpchk GET /index.cgi

13
roles/varnish/templates/proxies.vcl.j2
View file

@ -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 { sub vcl_init {
new fas = directors.round_robin(); new fas = directors.round_robin();
fas.add_backend(fas01); fas.add_backend(fas01);
fas.add_backend(fas02); fas.add_backend(fas02);
fas.add_backend(fas03);
} }
backend nuancier { backend nuancier {