support new pulpcore entrypoints on pulpcore >= 3.33.

fixes: pulp#1486
msilmser · Jan 15, 2024 · d7da12d · d7da12d
1 parent d6beeb1
commit d7da12d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGES/1486.bugfix b/CHANGES/1486.bugfix
@@ -0,0 +1 @@
+Added conditional blocks around the ExecStart parts in pulpcore-api and pulpcore-content systemd units to support the new entrypoints in releases >= 3.33i
diff --git a/roles/pulp_api/templates/pulpcore-api.service.j2 b/roles/pulp_api/templates/pulpcore-api.service.j2
@@ -25,7 +25,11 @@ LimitNOFILE=524288
 
 # timeout is needed Pulp to service its 1st request on extremely slow
 # machines, such as qemu-emulated 2-core machines
+{% if __pulpcore_version is version('3.33', '>=') -%}
+ExecStart={{ __pulp_daemons_dir }}/pulpcore-api \
+{% else %}
 ExecStart={{ __pulp_daemons_dir }}/gunicorn pulpcore.app.wsgi:application \
+{%- endif %}
           --name pulp-api \
           --bind '{{ pulp_api_bind }}' \
           --workers {{ pulp_api_workers }} \

diff --git a/roles/pulp_content/templates/pulpcore-content.service.j2 b/roles/pulp_content/templates/pulpcore-content.service.j2
@@ -25,10 +25,14 @@ LimitNOFILE=524288
 
 # timeout is needed Pulp to service its 1st request on extremely slow
 # machines, such as qemu-emulated 2-core machines
+{% if __pulpcore_version is version('3.33', '>=') -%}
+ExecStart={{ __pulp_daemons_dir }}/pulpcore-content \
+{% else %}
 ExecStart={{ __pulp_daemons_dir }}/gunicorn pulpcore.content:server \
           --name pulp-content \
-          --bind '{{ pulp_content_bind }}' \
           --worker-class 'aiohttp.GunicornWebWorker' \
+{% endif %}
+          --bind '{{ pulp_content_bind }}' \
           --workers {{ pulp_content_workers }} \
           --timeout {{ pulp_service_timeout }} \
           --access-logfile -