Move fedora-elections fedmsg endpoints to the dynamically generated setup.

inventory/group_vars/elections

@@ -4,11 +4,11 @@ lvm_size: 20000
 mem_size: 2048
 num_cpus: 2
 
-tcp_ports: [ 80,
-    # 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: fedora_elections
+wsgi_procs: 2
+wsgi_threads: 2
 
+tcp_ports: [ 80 ]
 
 # 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/elections-stg

@@ -4,10 +4,11 @@ lvm_size: 20000
 mem_size: 1024
 num_cpus: 2
 
-tcp_ports: [ 80,
-    # 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: fedora_elections
+wsgi_procs: 2
+wsgi_threads: 2
+
+tcp_ports: [ 80 ]
 
 # 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/elections/templates/fedora-elections.conf

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

roles/fedmsg/base/tasks/main.yml

@@ -40,6 +40,7 @@
   - endpoints-nuancier.py
   - endpoints-kerneltest.py
   - endpoints-github2fedmsg.py
+  - endpoints-elections.py
   tags:
   - config
   - fedmsgdconfig
@@ -64,7 +65,6 @@
   - endpoints-anitya.py
   - endpoints-pagure.py
   - endpoints-fedocal.py
-  - endpoints-elections.py
   - endpoints-fedbadges.py
   - endpoints-fmn-web.py
   - endpoints-fmn-backend.py

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

@@ -1,20 +0,0 @@
-{% if env == 'staging' %}
-suffix  = 'stg.phx2.fedoraproject.org'
-{% else %}
-suffix = 'phx2.fedoraproject.org'
-{% endif %}
-
-config = dict(
-    endpoints={
-        "fedora_elections.elections01": [
-            "tcp://elections01.%s:30%02i" % (suffix, i)
-            for i in range(16)
-        ],
-{% if env != 'staging' %}
-        "fedora_elections.elections02": [
-            "tcp://elections02.%s:30%02i" % (suffix, i)
-            for i in range(16)
-        ],
-{% endif %}
-    },
-)