Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Convert fas over from static fedmsg endpoints to dynamic.

Browse source
This commit is contained in:
Ralph Bean 2015-06-30 17:34:54 +00:00
parent ee541ec29c
commit 43fcc72954
4 changed files with 13 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
inventory/group_vars/fas
View file

@ -7,15 +7,12 @@ num_cpus: 4
# for systems that do not match the above - specify the same parameter in # for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file # the host_vars/$hostname file
tcp_ports: [ 80, 873, 8443, 8444, wsgi_fedmsg_service: fas
# fas has 40 wsgi processes, each of which need their own port # Why does this have 40 and 1. that seems really odd.
# open for outbound fedmsg messages. wsgi_procs: 40
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, wsgi_threads: 1
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015,
3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, tcp_ports: [ 80, 873, 8443, 8444 ]
3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031,
3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039,
]
fas_client_groups: sysadmin-main,sysadmin-accounts fas_client_groups: sysadmin-main,sysadmin-accounts

15
inventory/group_vars/fas-stg
View file

@ -7,15 +7,12 @@ num_cpus: 2
# for systems that do not match the above - specify the same parameter in # for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file # the host_vars/$hostname file
tcp_ports: [ 80, 873, 8443, 8444, wsgi_fedmsg_service: fas
# fas has 40 wsgi processes, each of which need their own port # Why does this have 40 and 1. that seems really odd.
# open for outbound fedmsg messages. wsgi_procs: 40
3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, wsgi_threads: 1
3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015,
3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023, tcp_ports: [ 80, 873, 8443, 8444 ]
3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031,
3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039,
]
fas_client_groups: sysadmin-main,sysadmin-accounts fas_client_groups: sysadmin-main,sysadmin-accounts

2
roles/fas_server/templates/fas-app.conf.j2
View file

@ -16,7 +16,7 @@ WSGISocketPrefix run/wsgi
WSGIRestrictSignal Off WSGIRestrictSignal Off
# These are the real tunables # These are the real tunables
WSGIDaemonProcess fas processes=40 threads=1 maximum-requests=100 user=fas group=fas display-name=fas inactivity-timeout=300 shutdown-timeout=10 WSGIDaemonProcess fas processes={{wsgi_procs}} threads={{wsgi_threads}} maximum-requests=100 user=fas group=fas display-name=fas inactivity-timeout=300 shutdown-timeout=10
WSGIPythonOptimize 1 WSGIPythonOptimize 1
WSGIScriptAlias /accounts /usr/sbin/fas.wsgi/accounts WSGIScriptAlias /accounts /usr/sbin/fas.wsgi/accounts

16
roles/fedmsg/base/templates/endpoints.py.j2
View file

@ -37,22 +37,6 @@ config = dict(
"tcp://relepel01.%s:3001" % suffix, "tcp://relepel01.%s:3001" % suffix,
], ],
{% endif %} {% endif %}
# FAS is a little out of the ordinary. It has 32 endpoints instead of
# the usual 8 since there are so many mod_wsgi processes for it.
"fas.fas01": [
"tcp://fas01.%s:30%02i" % (suffix, i)
for i in range(40)
],
{% if env != 'staging' %}
"fas.fas02": [
"tcp://fas02.%s:30%02i" % (suffix, i)
for i in range(40)
],
"fas.fas03": [
"tcp://fas03.%s:30%02i" % (suffix, i)
for i in range(40)
],
{% endif %}
# This used to be on value01 and value03.. but now we just have one # This used to be on value01 and value03.. but now we just have one
"supybot.value01": [ "supybot.value01": [