Skip to content

Commit

Permalink
Fixes #36902 - update systemd services for Pulpcore 3.39
Browse files Browse the repository at this point in the history
  • Loading branch information
ianballou committed Nov 16, 2023
1 parent 65f3131 commit 2d818fb
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
with:
pidfile_workaround: 'false'
beaker_facter: 'pulpcore_version:Pulp:3.28,3.22,3.21'
beaker_facter: 'pulpcore_version:Pulp:nightly,3.39'
rubocop: false
cache-version: '1'
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
.github/workflows/ci.yml:
beaker_facter: 'pulpcore_version:Pulp:3.28,3.22,3.21'
beaker_facter: 'pulpcore_version:Pulp:nightly,3.39'
16 changes: 4 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,13 @@ All supported versions are listed below. For every supported version, acceptance

Supported operating systems are listed in `metadata.json` but individual releases can divert from that. For example, if Pulpcore x.y drops EL7, it will still be listed in metadata.json until all versions supported by the module have dropped it. Similarly, if x.z adds support for EL9, it'll be listed in `metadata.json` and all versions that don't support EL9 will have a note.

### Pulpcore 3.28
### Pulpcore nightly

Default recommended version.

### Pulpcore 3.22

Supported version.
The latest version of Pulpcore that is being tested.

### Pulpcore 3.21
### Pulpcore 3.39

Supported version. The parameter `$hide_guarded_distributions` doesn't work since it's a Pulp 3.22 feature.

### Pulpcore 3.16 - 3.18

Untested, but should work besides the `$hide_guarded_distributions` parameter. Not recommended.
Default recommended version.

## Installation layout

Expand Down
2 changes: 1 addition & 1 deletion manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @param version
# The Pulpcore version to use
class pulpcore::repo (
Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.28',
Variant[Enum['nightly'], Pattern['^\d+\.\d+$']] $version = '3.39',
) {
$dist_tag = "el${facts['os']['release']['major']}"
$context = {
Expand Down
2 changes: 1 addition & 1 deletion templates/pulpcore-api.service.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ User=<%= scope['pulpcore::user'] %>
Group=<%= scope['pulpcore::group'] %>
WorkingDirectory=<%= scope['pulpcore::user_home'] %>
RuntimeDirectory=pulpcore-api
ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.app.wsgi:application \
ExecStart=/usr/bin/pulpcore-api \
--preload \
--timeout <%= scope['pulpcore::api_service_worker_timeout'] %> \
--workers <%= scope['pulpcore::api_service_worker_count'] %> \
Expand Down
3 changes: 1 addition & 2 deletions templates/pulpcore-content.service.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ User=<%= scope['pulpcore::user'] %>
Group=<%= scope['pulpcore::group'] %>
WorkingDirectory=<%= scope['pulpcore::user_home'] %>
RuntimeDirectory=pulpcore-content
ExecStart=/usr/libexec/pulpcore/gunicorn pulpcore.content:server \
ExecStart=/usr/bin/pulpcore-content \
--preload \
--timeout <%= scope['pulpcore::content_service_worker_timeout'] %> \
--worker-class 'aiohttp.GunicornWebWorker' \
--workers <%= scope['pulpcore::content_service_worker_count'] %> \
--access-logfile -
ExecReload=/bin/kill -s HUP $MAINPID
Expand Down

0 comments on commit 2d818fb

Please sign in to comment.