Showing with 30 additions and 12 deletions.
  1. +1 −0 .github/workflows/ci.yml
  2. +10 −0 CHANGELOG.md
  3. +5 −1 README.md
  4. +2 −2 manifests/init.pp
  5. +1 −1 manifests/repo.pp
  6. +4 −4 metadata.json
  7. +2 −2 spec/acceptance/cli_spec.rb
  8. +3 −0 spec/acceptance/hieradata/os/RedHat/8.yaml
  9. +2 −2 spec/classes/pulpcore_spec.rb
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
pulpcore_version:
- '3.28'
- '3.22'
- '3.21'
name: Acceptance / ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }} - Pulp ${{ matrix.pulpcore_version }}
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## [8.3.0](https://github.com/theforeman/puppet-pulpcore/tree/8.3.0) (2023-08-16)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/8.2.0...8.3.0)

**Implemented enhancements:**

- Support Pulp 3.28 [\#299](https://github.com/theforeman/puppet-pulpcore/pull/299) ([ekohl](https://github.com/ekohl))
- puppetlabs/stdlib: Allow 9.x & puppet/systemd: Allow 5.x & puppetlabs/concat: Allow 9.x [\#296](https://github.com/theforeman/puppet-pulpcore/pull/296) ([bastelfreak](https://github.com/bastelfreak))
- Relax max\_requests [\#295](https://github.com/theforeman/puppet-pulpcore/pull/295) ([dralley](https://github.com/dralley))

## [8.2.0](https://github.com/theforeman/puppet-pulpcore/tree/8.2.0) (2023-06-20)

[Full Changelog](https://github.com/theforeman/puppet-pulpcore/compare/8.1.0...8.2.0)
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ 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.22
### Pulpcore 3.28

Default recommended version.

### Pulpcore 3.22

Supported version.

### Pulpcore 3.21

Supported version. The parameter `$hide_guarded_distributions` doesn't work since it's a Pulp 3.22 feature.
Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@
Integer[0] $api_service_worker_count = min(4, $facts['processors']['count']) + 1,
Integer[0] $content_service_worker_timeout = 90,
Integer[0] $api_service_worker_timeout = 90,
Integer[0] $api_service_worker_max_requests = 50,
Integer[0] $api_service_worker_max_requests_jitter = 30,
Integer[0] $api_service_worker_max_requests = 800,
Integer[0] $api_service_worker_max_requests_jitter = 100,
Hash[String[1], String[1]] $api_client_auth_cn_map = {},
Boolean $cache_enabled = false,
Optional[Variant[Integer[1], Enum['None']]] $cache_expires_ttl = undef,
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.22',
Pattern['^\d+\.\d+$'] $version = '3.28',
) {
$dist_tag = "el${facts['os']['release']['major']}"
$context = {
Expand Down
8 changes: 4 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "theforeman-pulpcore",
"version": "8.2.0",
"version": "8.3.0",
"author": "theforeman",
"summary": "Installs next generation Pulp server",
"license": "GPL-3.0-or-later",
"source": "https://github.com/theforeman/puppet-pulpcore",
"dependencies": [
{
"name": "puppetlabs/concat",
"version_requirement": ">= 4.0.0 < 9.0.0"
"version_requirement": ">= 4.0.0 < 10.0.0"
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 8.3.0 < 9.0.0"
"version_requirement": ">= 8.3.0 < 10.0.0"
},
{
"name": "puppet/redis",
Expand All @@ -28,7 +28,7 @@
},
{
"name": "puppet/systemd",
"version_requirement": ">= 2.2.0 < 5.0.0"
"version_requirement": ">= 2.2.0 < 6.0.0"
},
{
"name": "puppet/extlib",
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<<-PUPPET
include pulpcore
class { 'pulpcore::cli':
pulpcore_url => "https://${facts['fqdn']}/",
pulpcore_url => "https://${facts['networking']['fqdn']}/",
cert => "/etc/pulpcore-certs/client-cert.pem",
key => "/etc/pulpcore-certs/client-key.pem",
}
Expand Down Expand Up @@ -58,7 +58,7 @@ class { 'pulpcore::cli':
let(:manifest) do
<<-PUPPET
class { 'pulpcore::cli':
pulpcore_url => "https://${facts['fqdn']}/",
pulpcore_url => "https://${facts['networking']['fqdn']}/",
username => "admin",
password => "changeme",
}
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/hieradata/os/RedHat/8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
postgresql::globals::manage_dnf_module: true
postgresql::globals::version: "12"
4 changes: 2 additions & 2 deletions spec/classes/pulpcore_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@
is_expected.to contain_pulpcore__socket_service('pulpcore-api')
is_expected.to contain_systemd__unit_file('pulpcore-api.socket')
is_expected.to contain_systemd__unit_file('pulpcore-api.service').with_content(%r{--workers 2})
.with_content(%r{--max-requests 50})
.with_content(%r{--max-requests-jitter 30})
.with_content(%r{--max-requests 800})
.with_content(%r{--max-requests-jitter 100})
is_expected.to contain_file('/etc/systemd/system/pulpcore-api.socket').that_comes_before('Service[pulpcore-api.service]')
is_expected.to contain_pulpcore__socket_service('pulpcore-content')
is_expected.to contain_systemd__unit_file('pulpcore-content.socket')
Expand Down