Skip to content

Commit

Permalink
Fixes #32910: Support enabling content caching for Pulp
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed Jul 8, 2021
1 parent 18d53ec commit dee50ae
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@
#
# $pulpcore_django_secret_key:: Secret key used for cryptographic operations by Pulpcore's django runtime
#
# $pulpcore_cache_enabled:: Enable Redis based content caching within the Pulp content app.
#
# $pulpcore_cache_expires_ttl:: The number of seconds that content should be cached for.
# Specify 'None' to never expire the cache.
#
class foreman_proxy_content (
Boolean $pulpcore_mirror = false,

Expand Down Expand Up @@ -126,6 +131,8 @@
Optional[String[50]] $pulpcore_django_secret_key = undef,
Integer[0] $pulpcore_content_service_worker_timeout = $foreman_proxy_content::params::pulpcore_content_service_worker_timeout,
Integer[0] $pulpcore_api_service_worker_timeout = $foreman_proxy_content::params::pulpcore_api_service_worker_timeout,
Boolean $pulpcore_cache_enabled = false,
Optional[Variant[Integer[1], Enum['None']]] $pulpcore_cache_expires_ttl = undef,
) inherits foreman_proxy_content::params {
include certs
include foreman_proxy
Expand Down Expand Up @@ -259,6 +266,8 @@
content_service_worker_timeout => $pulpcore_content_service_worker_timeout,
api_service_worker_timeout => $pulpcore_api_service_worker_timeout,
api_client_auth_cn_map => $api_client_auth_cn_map,
cache_enabled => $pulpcore_cache_enabled,
cache_expires_ttl => $pulpcore_cache_expires_ttl,
before => Class['foreman_proxy::plugin::pulp'],
}

Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
{
"name": "theforeman/pulpcore",
"version_requirement": ">= 3.4.0 < 5.0.0"
"version_requirement": ">= 4.0.0 < 5.0.0"
}
],
"requirements": [
Expand Down

0 comments on commit dee50ae

Please sign in to comment.