Skip to content

Commit

Permalink
Support Pulp 3.13, drop earlier versions
Browse files Browse the repository at this point in the history
Pulp 3.13 moves to a new wrapper for the worker. This isn't present in
older releases so support for them is dropped.
  • Loading branch information
ekohl committed Jun 17, 2021
1 parent 714e187 commit a9bc811
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 20 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ jobs:
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
pulpcore_version:
- '3.9'
- '3.11'
- '3.13'
name: Acceptance / ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ 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.11
### Pulpcore 3.13

Recommended version.

### Pulpcore 3.9

At least version 3.9.1 should be used.
Only supported 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 (
Pattern['^\d+\.\d+$'] $version = '3.11',
Pattern['^\d+\.\d+$'] $version = '3.13',
) {
$context = {
'version' => $version,
Expand Down
6 changes: 1 addition & 5 deletions templates/pulpcore-resource-manager.service.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ User=<%= scope['pulpcore::user'] %>
Group=<%= scope['pulpcore::group'] %>
WorkingDirectory=<%= scope['pulpcore::user_home'] %>
RuntimeDirectory=pulpcore-resource-manager
ExecStart=/usr/libexec/pulpcore/rq worker \
-w pulpcore.tasking.worker.PulpWorker -n resource-manager \
-c 'pulpcore.rqconfig' \
--disable-job-desc-logging

ExecStart=/usr/libexec/pulpcore/pulpcore-worker --resource-manager
SyslogIdentifier=pulpcore-resource-manager

# This provides reconnect support for PostgreSQL and Redis. Without reconnect support, if either
Expand Down
8 changes: 2 additions & 6 deletions templates/[email protected]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Unit]
Description=Pulp RQ Worker
Description=Pulp Worker
After=network-online.target
Wants=network-online.target

Expand All @@ -13,11 +13,7 @@ User=<%= scope['pulpcore::user'] %>
Group=<%= scope['pulpcore::group'] %>
WorkingDirectory=<%= scope['pulpcore::user_home'] %>
RuntimeDirectory=pulpcore-worker-%i
ExecStart=/usr/libexec/pulpcore/rq worker \
-w pulpcore.tasking.worker.PulpWorker \
-c 'pulpcore.rqconfig' \
--disable-job-desc-logging

ExecStart=/usr/libexec/pulpcore/pulpcore-worker
SyslogIdentifier=pulpcore-worker-%i

# This provides reconnect support for PostgreSQL and Redis. Without reconnect support, if either
Expand Down

0 comments on commit a9bc811

Please sign in to comment.