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

Jump to bottom

Allow configuring munge via this module #23

Merged
merged 1 commit into from
Sep 17, 2021
Merged

Allow configuring munge via this module #23

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
2 changes: 1 addition & 1 deletion manifests/client.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @api private
class slurm::client {

include ::munge
contain slurm::common::munge
contain slurm::common::user
contain slurm::common::install
contain slurm::common::setup
Expand Down
12 changes: 12 additions & 0 deletions manifests/common/munge.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# @api private
class slurm::common::munge {

if $slurm::manage_munge {
class { 'munge':
munge_key_source => $slurm::munge_key_source,
munge_key_content => $slurm::munge_key_content,
}
} else {
include ::munge
}
}
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 @@ -47,6 +47,9 @@
# @param slurm_user_shell
# @param slurmd_user
# @param slurmd_user_group
# @param manage_munge
# @param munge_key_source
# @param munge_key_content
# @param manage_slurm_conf
# @param manage_scripts
# @param manage_firewall
Expand Down Expand Up @@ -226,6 +229,11 @@
$slurmd_user = 'root',
$slurmd_user_group = 'root',

# Munge key
Boolean $manage_munge = false,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 3 new parameters will need documentation at the top of the file otherwise the puppet-lint tests will fail.

Optional[String] $munge_key_source = undef,
Optional[String] $munge_key_content = undef,

# Behavior overrides
$manage_slurm_conf = true,
$manage_scripts = true,
Expand Down
2 changes: 1 addition & 1 deletion manifests/slurmctld.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @api private
class slurm::slurmctld {

include ::munge
contain slurm::common::munge
contain slurm::common::user
contain slurm::common::install
contain slurm::common::setup
Expand Down
2 changes: 1 addition & 1 deletion manifests/slurmd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @api private
class slurm::slurmd {

include ::munge
contain slurm::common::munge
contain slurm::common::user
contain slurm::common::install
contain slurm::common::setup
Expand Down
2 changes: 1 addition & 1 deletion manifests/slurmdbd.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# @api private
class slurm::slurmdbd {

include ::munge
contain slurm::common::munge
contain slurm::common::user
contain slurm::common::install
contain slurm::common::setup
Expand Down