From d0452479ed0e61374cf342bad3624671dc59f0d9 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Thu, 23 Jul 2020 13:09:24 +0200 Subject: [PATCH] Revert "remove fedmsg variables which define endpoints on other fedmsg systems" We need to keep these variables defined as they are used in the .wsgi files to set the number of procs and threads for apache. This reverts commit 6e92ba25a722ed6995ee20bf83beffbedf57a94d. --- inventory/group_vars/odcs_frontend | 8 ++++++++ inventory/group_vars/odcs_frontend_stg | 8 ++++++++ inventory/group_vars/pkgs | 8 ++++++++ inventory/group_vars/pkgs_stg | 7 +++++++ 4 files changed, 31 insertions(+) diff --git a/inventory/group_vars/odcs_frontend b/inventory/group_vars/odcs_frontend index b5b2fbf1cb..8f096731ff 100644 --- a/inventory/group_vars/odcs_frontend +++ b/inventory/group_vars/odcs_frontend @@ -5,6 +5,14 @@ num_cpus: 2 freezes: true +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: odcs +wsgi_procs: 2 +wsgi_threads: 2 + tcp_ports: [ 80, # These ports all required for gluster diff --git a/inventory/group_vars/odcs_frontend_stg b/inventory/group_vars/odcs_frontend_stg index a763fdf22c..0399db1cb7 100644 --- a/inventory/group_vars/odcs_frontend_stg +++ b/inventory/group_vars/odcs_frontend_stg @@ -6,6 +6,14 @@ num_cpus: 2 # Set this to True for the F28 release and onwards. freezes: false +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: odcs +wsgi_procs: 2 +wsgi_threads: 2 + tcp_ports: [ 80, # These ports all required for gluster diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs index fed6be8ffc..90999ad04b 100644 --- a/inventory/group_vars/pkgs +++ b/inventory/group_vars/pkgs @@ -9,6 +9,14 @@ tcp_ports: [ 80, 443 ] # To make things easy on the listening side (so avoid contention of binding ports), let's set the pkgs boxes to active fedmsg. fedmsg_active: True +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: pagure +wsgi_procs: 6 +wsgi_threads: 6 + pagure_static_uid: 600 diff --git a/inventory/group_vars/pkgs_stg b/inventory/group_vars/pkgs_stg index b6e6e818fe..76c3c8c04b 100644 --- a/inventory/group_vars/pkgs_stg +++ b/inventory/group_vars/pkgs_stg @@ -5,6 +5,13 @@ max_mem_size: 32768 num_cpus: 4 tcp_ports: [ 80, 443, 8444, 8443, 8445 ] +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: pagure +wsgi_procs: 4 +wsgi_threads: 4 pagure_static_uid: 600