Move pkgdb from static fedmsg endpoints to dynamic.

inventory/group_vars/pkgdb

@@ -7,10 +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,
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+wsgi_fedmsg_service: pkgdb2
+wsgi_procs: 3
+wsgi_threads: 2
+
+tcp_ports: [ 80 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-web,sysadmin-releng,sysadmin-cvs
 

inventory/group_vars/pkgdb-stg

@@ -7,10 +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,
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+wsgi_fedmsg_service: pkgdb2
+wsgi_procs: 2
+wsgi_threads: 2
+
+tcp_ports: [ 80 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-web,sysadmin-releng,sysadmin-cvs
 

roles/fedmsg/base/tasks/main.yml

@@ -52,6 +52,7 @@
   - endpoints-github2fedmsg.py
   - endpoints-elections.py
   - endpoints-fmn-web.py
+  - pkgdb.py
   tags:
   - config
   - fedmsgdconfig
@@ -84,7 +85,6 @@
   - endpoints-fedimg.py
   - endpoints-bugzilla2fedmsg.py
   - relay.py
-  - pkgdb.py
   - logging.py
   - base.py
   when: "'persistent-cloud' not in group_names"

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

@@ -1,22 +0,0 @@
-{% if env == 'staging' %}
-suffix  = 'stg.phx2.fedoraproject.org'
-non_phx_suffix = 'stg.fedoraproject.org'
-{% else %}
-suffix = 'phx2.fedoraproject.org'
-non_phx_suffix = 'fedoraproject.org'
-{% endif %}
-
-config = dict(
-    endpoints={
-        "pkgdb2.pkgdb01": [
-            "tcp://pkgdb01.%s:30%0.2i" % (suffix, i)
-            for i in range(16)
-        ],
-{% if not env == 'staging' %}
-        "pkgdb2.pkgdb02": [
-            "tcp://pkgdb02.%s:30%0.2i" % (suffix, i)
-            for i in range(16)
-        ],
-{% endif %}
-    },
-)

roles/pkgdb2/templates/pkgdb2.conf

@@ -1,7 +1,7 @@
 
 Alias /pkgdb/static /usr/lib/python2.7/site-packages/pkgdb2/static/
 
-WSGIDaemonProcess pkgdb user=apache maximum-requests=1000 display-name=pkgdb processes=4 threads=4
+WSGIDaemonProcess pkgdb user=apache maximum-requests=1000 display-name=pkgdb processes={{ wsgi_procs }} threads={{ wsgi_threads }}
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout On
 WSGIRestrictSignal Off