Merge pull request #364 from ComputeCanada/slurm24.05

Add support for Slurm24.05
ComputeCanada · Jun 7, 2024 · 2c20819 · 2c20819
2 parents b177412 + c3ce0e7
commit 2c20819
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -946,7 +946,7 @@ to all Slurm's roles. It also installs and configure Munge service.
 | :---------------------- | :----------------------- | :------ |
 | `cluster_name`          | Name of the cluster      | String  |
 | `munge_key`             | Base64 encoded Munge key | String  |
-| `slurm_version`         | Slurm version to install | Enum['21.08', '22.05', '23.02', '23.11'] |
+| `slurm_version`         | Slurm version to install | Enum['21.08', '22.05', '23.02', '23.11', '24.05'] |
 | `os_reserved_memory`    | Memory in MB reserved for the operating system on the compute nodes | Integer |
 | `suspend_time`          | Idle time (seconds) for nodes to becomes eligible for suspension. | Integer |
 | `resume_timeout`        | Maximum time permitted (seconds) between a node resume request and its availability. | Integer |

diff --git a/site/profile/manifests/slurm.pp b/site/profile/manifests/slurm.pp
@@ -9,7 +9,7 @@
 class profile::slurm::base (
   String $cluster_name,
   String $munge_key,
-  Enum['21.08', '22.05', '23.02', '23.11'] $slurm_version,
+  Enum['21.08', '22.05', '23.02', '23.11', '24.05'] $slurm_version,
   Integer $os_reserved_memory,
   Integer $suspend_time = 3600,
   Integer $resume_timeout = 3600,

diff --git a/site/profile/templates/slurm/cgroup.conf.epp b/site/profile/templates/slurm/cgroup.conf.epp
@@ -1,6 +1,4 @@
-CgroupPlugin="cgroup/v1"
 CgroupMountpoint="/sys/fs/cgroup"
-CgroupAutomount=no
 <% if versioncmp($slurm_version, '22.05') < 0 { -%>
 AllowedDevicesFile="/etc/slurm/cgroup_allowed_devices_file.conf"
 <% } -%>