Skip to content

Commit

Permalink
Fixes #32338 - expose pulpcore allowed_content_checksums
Browse files Browse the repository at this point in the history
  • Loading branch information
jlsherrill committed Apr 19, 2021
1 parent f395738 commit dabd8b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
#
# $qpid_router_ssl_protocols:: Protocols to support in dispatch router (e.g. TLSv1.2, etc)
#
# $pulpcore_allowed_content_checksums:: List of checksums to use for pulpcore content operations
#
# $pulpcore_manage_postgresql:: Manage the Pulpcore PostgreSQL database.
#
# $pulpcore_postgresql_host:: Host of the Pulpcore PostgreSQL database. Must be specified if external/unmanaged.
Expand Down Expand Up @@ -108,6 +110,7 @@
Boolean $pulpcore_manage_postgresql = true,
Stdlib::Host $pulpcore_postgresql_host = 'localhost',
Stdlib::Port $pulpcore_postgresql_port = 5432,
Array[Enum['md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512']] $pulpcore_allowed_content_checksums = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512'],
String $pulpcore_postgresql_user = 'pulp',
String $pulpcore_postgresql_password = $foreman_proxy_content::params::pulpcore_postgresql_password,
String $pulpcore_postgresql_db_name = 'pulpcore',
Expand Down Expand Up @@ -221,6 +224,7 @@
}

class { 'pulpcore':
allowed_content_checksums => $pulpcore_allowed_content_checksums,
allowed_import_path => $pulpcore_allowed_import_path,
allowed_export_path => $pulpcore_allowed_export_path,
apache_http_vhost => $apache_http_vhost,
Expand Down
1 change: 1 addition & 0 deletions spec/classes/foreman_proxy_content_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
.with(apache_https_vhost: 'foreman-ssl')
.with(content_service_worker_timeout: 90)
.with(api_service_worker_timeout: 90)
.with(allowed_content_checksums: ['sha1', 'sha224', 'sha256', 'sha384', 'sha512'])
.that_comes_before('Class[foreman_proxy::plugin::pulp]')
end

Expand Down

0 comments on commit dabd8b4

Please sign in to comment.