Modernize bodhi fedmsg configuration.

inventory/group_vars/bodhi

@@ -9,10 +9,15 @@ 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,
+# Definining these vars has a number of effects
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
+# 1) mod_wsgi is configured to use the vars for its own setup
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+# 2) iptables opens enough ports for all threads for fedmsg
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
+wsgi_fedmsg_service: bodhi
+wsgi_procs: 4
+wsgi_threads: 1
+
+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/bodhi-stg

@@ -10,10 +10,15 @@ 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,
+# Definining these vars has a number of effects
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
+# 1) mod_wsgi is configured to use the vars for its own setup
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+# 2) iptables opens enough ports for all threads for fedmsg
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
+wsgi_fedmsg_service: bodhi
+wsgi_procs: 4
+wsgi_threads: 1
+
+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/bodhi/base/tasks/main.yml

@@ -31,7 +31,7 @@
   - bodhi
 
 - name: setup basic /etc/httpd/conf.d/ bodhi contents
-  copy: >
+  template: >
     src="bodhi-app.conf"  
     dest="/etc/httpd/conf.d/bodhi.conf"
     owner=root

roles/bodhi/base/templates/bodhi-app.conf

@@ -3,7 +3,7 @@ Alias /updates/static /usr/share/bodhi/static
 WSGISocketPrefix run/wsgi
 WSGIRestrictSignal Off
 
-WSGIDaemonProcess bodhi user=bodhi group=bodhi display-name=bodhi processes=4 threads=1
+WSGIDaemonProcess bodhi user=bodhi group=bodhi display-name=bodhi processes={{wsgi_procs}} threads={{wsgi_threads}}
 WSGIPythonOptimize 1
 
 WSGIScriptAlias /updates /usr/share/bodhi/bodhi.wsgi/updates

roles/bodhi2/base/tasks/main.yml

@@ -59,7 +59,7 @@
 
 
 - name: setup basic /etc/httpd/conf.d/ bodhi contents
-  copy: >
+  template: >
     src="bodhi-app.conf"  
     dest="/etc/httpd/conf.d/bodhi.conf"
     owner=root

roles/bodhi2/base/templates/bodhi-app.conf

@@ -1,6 +1,6 @@
 Alias /static /usr/lib/python2.7/site-packages/bodhi/static/
 
-WSGIDaemonProcess bodhi user=bodhi group=bodhi display-name=bodhi processes=2 threads=2
+WSGIDaemonProcess bodhi user=bodhi group=bodhi display-name=bodhi processes={{wsgi_procs}} threads={{wsgi_threads}}
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout On
 WSGIRestrictSignal Off

roles/bodhi2/base/templates/production.ini.j2

@@ -23,7 +23,7 @@ libravatar_enabled = True
 libravatar_dns = False
 
 # Set this to True in order to send fedmsg messages.
-#fedmsg_enabled = True
+fedmsg_enabled = True
 
 
 # Captcha - if 'captcha.secret' is not None, then it will be used for comments

roles/bodhi2/base/templates/staging.ini.j2

@@ -29,7 +29,7 @@ libravatar_enabled = True
 libravatar_dns = False
 
 # Set this to True in order to send fedmsg messages.
-#fedmsg_enabled = True
+fedmsg_enabled = True
 
 
 # Captcha - if 'captcha.secret' is not None, then it will be used for comments