diff --git a/CHANGES/1486.bugfix b/CHANGES/1486.bugfix new file mode 100644 index 000000000..3ec2832f9 --- /dev/null +++ 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 index 08a4a2347..4df62233a 100644 --- 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 index 5d1e6ca63..3319aae8c 100644 --- 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 -