Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add parameters gpgcheck and gpgkey #83

Merged
merged 1 commit into from
Nov 20, 2017
+16 −2
Merged

Add parameters gpgcheck and gpgkey #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@
# [*install_repositories*]
# Bool to install repositories or not
#
# [*gpgcheck*]
# Boolean to specify whether the GPG signature of the packages should be checked
#
# [*gpgkey*]
# URL of the GPG key used to sign the packages
#
# [*$is_scheduler*]
# If current machine is a condor scheduler
#
Expand Down Expand Up @@ -125,6 +131,8 @@
$include_username_in_accounting =
$htcondor::params::include_username_in_accounting,
$install_repositories = $htcondor::params::install_repositories,
$gpgcheck = $htcondor::params::gpgcheck,
$gpgkey = $htcondor::params::gpgkey,
$dev_repositories = $htcondor::params::dev_repositories,
$is_scheduler = $htcondor::params::is_scheduler,
$is_manager = $htcondor::params::is_manager,
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
$include_username_in_accounting = hiera('include_username_in_accounting',
false)
$install_repositories = hiera('install_repositories', true)
$gpgcheck = hiera('gpgcheck', true)
$gpgkey = hiera('gpgkey', 'http://htcondor.org/yum/RPM-GPG-KEY-HTCondor')
$dev_repositories = hiera('dev_repositories', false)

$machine_owner = hiera('machine_owner', 'physics')
Expand Down
8 changes: 6 additions & 2 deletions manifests/repositories.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Provides yum repositories for HTCondor installation
class htcondor::repositories {
$dev_repos = $htcondor::dev_repositories
$gpgcheck = $htcondor::gpgcheck
$gpgkey = $htcondor::gpgkey
$condor_priority = $htcondor::condor_priority
$major_release = regsubst($::operatingsystemrelease, '^(\d+)\.\d+$', '\1')

Expand All @@ -13,7 +15,8 @@
descr => "HTCondor Development RPM Repository for Redhat Enterprise Linux ${facts['os']['release']['major']}",
baseurl => 'http://research.cs.wisc.edu/htcondor/yum/development/rhel$releasever',
enabled => 1,
gpgcheck => 0,
gpgcheck => bool2num($gpgcheck),
gpgkey => $gpgkey,
priority => $condor_priority,
exclude => 'condor.i386, condor.i686',
before => [Package['condor']],
Expand All @@ -23,7 +26,8 @@
descr => "HTCondor Stable RPM Repository for Redhat Enterprise Linux ${facts['os']['release']['major']}",
baseurl => 'http://research.cs.wisc.edu/htcondor/yum/stable/rhel$releasever',
enabled => 1,
gpgcheck => 0,
gpgcheck => bool2num($gpgcheck),
gpgkey => $gpgkey,
priority => $condor_priority,
exclude => 'condor.i386, condor.i686',
before => [Package['condor']],
Expand Down