Add a pulp_content role configuration option for gunicorn workers

closes: #8267 https://pulp.plan.io/issues/8267
pulp · Feb 17, 2021 · 1876c18 · 1876c18
1 parent bc0554f
commit 1876c18
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES/8267.feature b/CHANGES/8267.feature
@@ -0,0 +1 @@
+The `pulp_content_workers` option can be used to adjust the number of Gunicorn worker processes handling content app requests.
diff --git a/roles/pulp_api/README.md b/roles/pulp_api/README.md
@@ -10,9 +10,7 @@ Role Variables
   listen.](https://docs.gunicorn.org/en/stable/settings.html#bind)
   One can specify a unix socket path instead (recommended value is `'unix:/var/run/pulpcore-api/pulpcore-api.sock'`).
   Defaults to `'127.0.0.1:24817'`.
-* `pulp_api_workers`: Number of Pulp Content `gunicorn` processes for handling requests. Defaults to 1.
-  Used to render the `pulpcore-api.service.j2` template, passing to the `--workers` parameter of the
-  gunicorn service.
+* `pulp_api_workers`: Number of `gunicorn` processes for handling Pulp API requests. Defaults to 1.
 * `pulp_token_auth_key`: Location of the openssl private key (in pem format) to use for token
   authentication. If not specified, a new key wil be generated.
 

diff --git a/roles/pulp_content/README.md b/roles/pulp_content/README.md
@@ -8,6 +8,8 @@ Role Variables
 
 * `pulp_content_bind`: Interface and Port where Pulp Content [`gunicorn` service will
   listen.](https://docs.gunicorn.org/en/stable/settings.html#bind)
+* `pulp_content_workers`: Number of `gunicorn` processes for handling Pulp content app requests.
+  Defaults to 8.
 
 One can specify a unix socket path instead
 (recommended value is `'unix:/var/run/pulpcore-content/pulpcore-content.sock'`).

diff --git a/roles/pulp_content/defaults/main.yml b/roles/pulp_content/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 pulp_content_bind: '127.0.0.1:24816'
+pulp_content_workers: 8
diff --git a/roles/pulp_content/templates/pulpcore-content.service.j2 b/roles/pulp_content/templates/pulpcore-content.service.j2
@@ -20,7 +20,7 @@ RuntimeDirectory=pulpcore-content
 ExecStart={{ __pulp_daemons_dir }}/gunicorn pulpcore.content:server \
           --bind '{{ pulp_content_bind }}' \
           --worker-class 'aiohttp.GunicornWebWorker' \
-          -w 2 \
+          --workers {{ pulp_content_workers }} \
           --timeout 90 \
           --access-logfile -