infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 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

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

@ -16,7 +16,7 @@ WSGISocketPrefix run/wsgi
WSGIRestrictSignal Off
# 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
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,
],
{% 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
"supybot.value01": [