Reduce fedora-tagger procs x threads.

inventory/group_vars/tagger

@@ -7,12 +7,11 @@ num_cpus: 2
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-tcp_ports: [ 80, 443,
+wsgi_fedmsg_service: fedoratagger
-    # These 32 ports are used by fedmsg.  One for each wsgi thread.
+wsgi_procs: 2
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+wsgi_threads: 2
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015,
+
-    3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023,
+tcp_ports: [ 80 ]
-    3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031]
 
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]

inventory/group_vars/tagger-stg

@@ -7,12 +7,11 @@ num_cpus: 2
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-tcp_ports: [ 80, 443,
+wsgi_fedmsg_service: fedoratagger
-    # These 32 ports are used by fedmsg.  One for each wsgi thread.
+wsgi_procs: 2
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+wsgi_threads: 2
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015,
+
-    3016, 3017, 3018, 3019, 3020, 3021, 3022, 3023,
+tcp_ports: [ 80 ]
-    3024, 3025, 3026, 3027, 3028, 3029, 3030, 3031]
 
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]

roles/fedmsg/base/templates/endpoints.py.j2

@@ -53,17 +53,6 @@ config = dict(
             for i in range(40)
         ],
 {% endif %}
-        # fedoratagger needs 32 endpoints too, just like FAS.
-        "fedoratagger.tagger01": [
-            "tcp://tagger01.%s:30%02i" % (suffix, i)
-            for i in range(32)
-        ],
-{% if env != 'staging' %}
-        "fedoratagger.tagger02": [
-            "tcp://tagger02.%s:30%02i" % (suffix, i)
-            for i in range(32)
-        ],
-{% endif %}
 
         # This used to be on value01 and value03.. but now we just have one
         "supybot.value01": [

roles/tagger/tasks/main.yml

@@ -46,7 +46,7 @@
   - restart apache
 
 - name: copy tagger httpd config
-  copy: >
+  template: >
     src=fedoratagger-app.conf
     dest=/etc/httpd/conf.d/fedoratagger.conf
     owner=apache

roles/tagger/templates/fedoratagger-app.conf

@@ -28,7 +28,7 @@ Alias /tagger/rating /usr/lib/python2.7/site-packages/fedoratagger/frontend/stat
 Alias /tagger/_res /usr/share/fedoratagger/toscawidgets/resources
 
 WSGIPythonEggs /var/cache/fedoracommunity/.python-eggs
-WSGIDaemonProcess fedoratagger user=apache group=fedoratagger maximum-requests=50000 display-name=fedoratagger processes=8 threads=4 inactivity-timeout=300
+WSGIDaemonProcess fedoratagger user=apache group=fedoratagger maximum-requests=50000 display-name=fedoratagger processes={{ wsgi_procs }} threads={{ wsgi_threads }} inactivity-timeout=300
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout Off
 WSGIRestrictSignal Off