Skip to content

Commit 27dce77

Browse files
committed
fix: allow user to give their own munge.key, which might have generated manually by hand and added in the linuxaid-config as a static file
1 parent 9c28429 commit 27dce77

File tree

2 files changed

+9
-3
lines changed
  • modules/enableit

2 files changed

+9
-3
lines changed

modules/enableit/profile/manifests/computing/slurm.pp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
Array[Eit_types::IPCIDR] $node_cidrs = $::role::computing::slurm::node_cidrs,
1212
Eit_types::Version $slurm_version = $::role::computing::slurm::slurm_version,
1313
Eit_types::Version $munge_version = $::role::computing::slurm::munge_version,
14-
Optional[String] $munge_key = $::role::computing::slurm::munge_key,
14+
Optional[Varaint[
15+
Eit_Files::Source,
16+
String
17+
]] $munge_key = $::role::computing::slurm::munge_key,
1518
Boolean $slurmctld = $::role::computing::slurm::slurmctld,
1619
Boolean $slurmdbd = $::role::computing::slurm::slurmdbd,
1720
Boolean $slurmd = $::role::computing::slurm::slurmd,
@@ -79,7 +82,7 @@
7982

8083
# Munge
8184
manage_munge => true,
82-
munge_create_key => true,
85+
munge_create_key => false,
8386
munge_uid => 64031,
8487
munge_gid => 64031,
8588
munge_key_content => $munge_key.node_encrypt::secret,

modules/enableit/role/manifests/computing/slurm.pp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@
4343
# @param encrypt_params The list of params, which needs to be encrypted
4444
#
4545
class role::computing::slurm (
46-
Optional[String] $munge_key = undef,
4746
Boolean $__blendable,
47+
Optional[Variant[
48+
Eit_Files::Source,
49+
String
50+
]] $munge_key = undef,
4851
Boolean $enable = false,
4952
Eit_types::SimpleString $interface = undef,
5053
Array[Eit_types::IPCIDR] $node_cidrs = [],

0 commit comments

Comments
 (0)