From db7784e47333d29b6639ab888aede054c65903bc Mon Sep 17 00:00:00 2001 From: Markus Bucher Date: Tue, 31 Jan 2023 16:21:09 +0100 Subject: [PATCH] Add param for unsave advisory conflict resolution --- manifests/init.pp | 5 +++++ templates/settings.py.erb | 1 + 2 files changed, 6 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 8566ea5..b991e44 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -130,6 +130,10 @@ # @param allowed_content_checksums # List of checksum types to allow for content operations # +# @param allow_automatic_unsafe_advisory_conflict_resolution +# Allow resolving of conflicts due to duplicate advisory ids with different creation dates +# https://docs.pulpproject.org/pulp_rpm/settings.html#allow-automatic-unsafe-advisory-conflict-resolution +# # @param worker_count # Number of pulpcore workers. Defaults to 8 or the number of CPU cores, whichever is smaller. Enabling more than 8 workers, even with additional CPU cores # available, likely results in performance degradation due to I/O blocking and is not recommended in most cases. Modifying this parameter should @@ -224,6 +228,7 @@ Array[Stdlib::Absolutepath] $allowed_import_path = ['/var/lib/pulp/sync_imports'], Array[Stdlib::Absolutepath] $allowed_export_path = [], Pulpcore::ChecksumTypes $allowed_content_checksums = ['sha224', 'sha256', 'sha384', 'sha512'], + Boolean $allow_automatic_unsafe_advisory_conflict_resolution = false, String[1] $remote_user_environ_name = 'HTTP_REMOTE_USER', Integer[0] $worker_count = min(8, $facts['processors']['count']), Optional[Integer[0]] $worker_ttl = undef, diff --git a/templates/settings.py.erb b/templates/settings.py.erb index dc0211d..d01495f 100644 --- a/templates/settings.py.erb +++ b/templates/settings.py.erb @@ -60,6 +60,7 @@ REST_FRAMEWORK__DEFAULT_AUTHENTICATION_CLASSES = ( ALLOWED_IMPORT_PATHS = <%= scope['pulpcore::allowed_import_path'] %> ALLOWED_EXPORT_PATHS = <%= scope['pulpcore::allowed_export_path'] %> ALLOWED_CONTENT_CHECKSUMS = <%= scope['pulpcore::allowed_content_checksums'] %> +ALLOW_AUTOMATIC_UNSAFE_ADVISORY_CONFLICT_RESOLUTION = <%= scope['pulpcore::allow_automatic_unsafe_advisory_conflict_resolution'] ? 'True' : 'False' %> # Derive HTTP/HTTPS via the X-Forwarded-Proto header set by Apache SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')