Skip to content
This repository was archived by the owner on Sep 5, 2025. It is now read-only.

Commit 8c9f7d8

Browse files
committed
Add support for yum gpg_key_id and gpg_cmd parameters
1 parent 88468d2 commit 8c9f7d8

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

manifests/init.pp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@
190190
#
191191
# $yum_gpg_sign_repo_metadata:: Whether yum repo metadata GPG signing will be enabled
192192
#
193+
# $yum_gpg_key_id:: GPG Key ID to use for yum repo metadata signing
194+
#
195+
# $yum_gpg_cmd:: Custom GPG command/script to use for yum repo metadata signing
196+
#
193197
# $num_workers:: Number of Pulp workers to use.
194198
#
195199
# $enable_admin:: Whether to install and configure the admin command
@@ -347,6 +351,8 @@
347351
Optional[String] $proxy_password = $::pulp::params::proxy_password,
348352
Optional[String] $yum_max_speed = $::pulp::params::yum_max_speed,
349353
Boolean $yum_gpg_sign_repo_metadata = $::pulp::params::yum_gpg_sign_repo_metadata,
354+
Optional[String] $yum_gpg_key_id = $::pulp::params::yum_gpg_key_id,
355+
Optional[String] $yum_gpg_cmd = $::pulp::params::yum_gpg_cmd,
350356
Integer[0] $num_workers = $::pulp::params::num_workers,
351357
Integer[0] $worker_timeout = $::pulp::params::worker_timeout,
352358
Boolean $enable_admin = $::pulp::params::enable_admin,

manifests/params.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118

119119
$yum_max_speed = undef
120120
$yum_gpg_sign_repo_metadata = false
121+
$yum_gpg_key_id = undef
122+
$yum_gpg_cmd = undef
121123

122124
$wsgi_processes = 3
123125
$wsgi_max_requests = 0

templates/yum_importer.json.erb

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,15 @@
2424
<% else %>
2525
"max_speed": null,
2626
<% end %>
27-
"gpg_sign_metadata": <%= scope['pulp::yum_gpg_sign_repo_metadata'] ? "true" : "false" %>
27+
"gpg_sign_metadata": <%= scope['pulp::yum_gpg_sign_repo_metadata'] ? "true" : "false" %>,
28+
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::yum_gpg_key_id']) -%>
29+
"gpg_key_id": <%= scope['pulp::yum_gpg_key_id'] %>,
30+
<% else %>
31+
"gpg_key_id": null,
32+
<% end %>
33+
<% unless [nil, :undefined, :undef, ''].include?(scope['pulp::yum_gpg_cmd']) -%>
34+
"gpg_cmd": <%= scope['pulp::yum_gpg_cmd'] %>
35+
<% else %>
36+
"gpg_cmd": null
37+
<% end %>
2838
}

0 commit comments

Comments
 (0)