diff --git a/README.md b/README.md index 23746f5ec..8385854c2 100644 --- a/README.md +++ b/README.md @@ -928,6 +928,7 @@ to all Slurm's roles. It also installs and configure Munge service. | `resume_timeout` | Maximum time permitted (seconds) between a node resume request and its availability. | Integer | | `force_slurm_in_path` | Enable Slurm's bin path in all users (local and LDAP) PATH environment variable | Boolean | | `enable_x11_forwarding` | Enable Slurm's built-in X11 forwarding capabilities | Boolean | +| `config_addendum` | Additional parameters included at the end of slurm.conf. | String |
default values @@ -941,6 +942,7 @@ profile::slurm::base::suspend_time: 3600 profile::slurm::base::resume_timeout: 3600 profile::slurm::base::force_slurm_in_path: false profile::slurm::base::enable_x11_forwarding: true +profile::slurm::base::config_addendum: '' ```
diff --git a/site/profile/manifests/slurm.pp b/site/profile/manifests/slurm.pp index f32718629..283bc9074 100644 --- a/site/profile/manifests/slurm.pp +++ b/site/profile/manifests/slurm.pp @@ -15,6 +15,7 @@ Integer $resume_timeout = 3600, Boolean $force_slurm_in_path = false, Boolean $enable_x11_forwarding = true, + String $config_addendum = '', ) { include epel @@ -207,6 +208,20 @@ require => File['/etc/slurm'], } + file { '/etc/slurm/slurm-addendum.conf': + ensure => present, + content => @("EOF"), + # FILE MANAGED BY PUPPET, DO NOT EDIT DIRECTLY. + # Content of this file has been specified via profile::slurm::base::config_addendum. + # It has not been validated. + ${config_addendum} + |EOF + group => 'slurm', + owner => 'slurm', + mode => '0644', + require => File['/etc/slurm'], + } + file { '/etc/slurm/slurm-consul.tpl': ensure => 'present', source => 'puppet:///modules/profile/slurm/slurm-consul.tpl', diff --git a/site/profile/templates/slurm/slurm.conf.epp b/site/profile/templates/slurm/slurm.conf.epp index 3da885ebe..03611ac77 100644 --- a/site/profile/templates/slurm/slurm.conf.epp +++ b/site/profile/templates/slurm/slurm.conf.epp @@ -81,3 +81,5 @@ JobSubmitPlugins=lua # Not needed for Slurm >= 23.02 PrivateData=cloud <% } -%> + +include /etc/slurm/slurm-addendum.conf