Skip to content

Commit

Permalink
Added support to configure the GPG check for the OnDemand repo (#159)
Browse files Browse the repository at this point in the history
  • Loading branch information
abujeda authored Sep 6, 2024
1 parent 7759c7e commit b0131b2
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
18 changes: 18 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ The following parameters are available in the `openondemand` class:
* [`repo_release`](#-openondemand--repo_release)
* [`repo_baseurl_prefix`](#-openondemand--repo_baseurl_prefix)
* [`repo_gpgkey`](#-openondemand--repo_gpgkey)
* [`repo_gpgcheck`](#-openondemand--repo_gpgcheck)
* [`repo_repogpgcheck`](#-openondemand--repo_repogpgcheck)
* [`repo_proxy`](#-openondemand--repo_proxy)
* [`repo_priority`](#-openondemand--repo_priority)
* [`repo_module_hotfixes`](#-openondemand--repo_module_hotfixes)
Expand Down Expand Up @@ -197,6 +199,22 @@ The URL for OnDemand repo GPG key

Default value: `'https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512'`

##### <a name="-openondemand--repo_gpgcheck"></a>`repo_gpgcheck`

Data type: `Variant[Boolean, Enum['1','0', 'yes', 'no']]`

Boolean to enable or disable the GPG check for the OnDemand repo

Default value: `'1'`

##### <a name="-openondemand--repo_repogpgcheck"></a>`repo_repogpgcheck`

Data type: `Variant[Boolean, Enum['1','0', 'yes', 'no']]`

Boolean to enable or disable the repo GPG check for the OnDemand repo

Default value: `'1'`

##### <a name="-openondemand--repo_proxy"></a>`repo_proxy`

Data type: `Optional[String[1]]`
Expand Down
6 changes: 6 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
# The baseurl prefix for OnDemand repo
# @param repo_gpgkey
# The URL for OnDemand repo GPG key
# @param repo_gpgcheck
# Boolean to enable or disable the GPG check for the OnDemand repo. Defaults to enabled
# @param repo_repogpgcheck
# Boolean to enable or disable the repo GPG check for the OnDemand repo. Defaults to enabled
# @param repo_proxy
# The URL for proxy for OnDemand repo
# @param repo_priority
Expand Down Expand Up @@ -247,6 +251,8 @@
$repo_baseurl_prefix = 'https://yum.osc.edu/ondemand',
Variant[Stdlib::HTTPSUrl, Stdlib::HTTPUrl, Stdlib::Absolutepath]
$repo_gpgkey = 'https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512',
Variant[Boolean, Enum['1','0', 'yes', 'no']] $repo_gpgcheck = '1',
Variant[Boolean, Enum['1','0', 'yes', 'no']] $repo_repogpgcheck = '1',
Optional[String[1]] $repo_proxy = undef,
Integer[1,99] $repo_priority = 99,
Optional[Boolean] $repo_module_hotfixes = undef,
Expand Down
8 changes: 4 additions & 4 deletions manifests/repo/rpm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
descr => 'Open OnDemand Web Repo',
baseurl => $openondemand::repo_baseurl,
enabled => '1',
gpgcheck => '1',
repo_gpgcheck => '1',
gpgcheck => $openondemand::repo_gpgcheck,
repo_gpgcheck => $openondemand::repo_repogpgcheck,
gpgkey => $openondemand::repo_gpgkey,
metadata_expire => '1',
priority => $openondemand::repo_priority,
Expand All @@ -31,8 +31,8 @@
descr => 'Open OnDemand Web Repo - Nightly',
baseurl => $openondemand::repo_nightly_baseurl,
enabled => '1',
gpgcheck => '1',
repo_gpgcheck => '1',
gpgcheck => $openondemand::repo_gpgcheck,
repo_gpgcheck => $openondemand::repo_repogpgcheck,
gpgkey => $openondemand::repo_gpgkey,
metadata_expire => '1',
priority => $openondemand::repo_priority,
Expand Down

0 comments on commit b0131b2

Please sign in to comment.