Merge pull request #1528 from wpoely86/slurm2108

ncm-metaconfig: version the slurm schema and add support for 21.08 and 23.02
quattor · Jun 26, 2023 · bcca304 · bcca304
2 parents 3a98ec5 + 64417ff
commit bcca304
Show file tree

Hide file tree

Showing 22 changed files with 2,604 additions and 778 deletions.
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/gres.tt b/ncm-metaconfig/src/main/metaconfig/slurm/gres.tt
@@ -1,5 +1,5 @@
 [% FOREACH pair IN CCM.contents.Default %]
-[% pair.key %]=[% pair.value -%]
+[% pair.key %]=[% INCLUDE 'metaconfig/slurm/value.tt' key=pair.key value=pair.value flavour='config' %]
 [%- END %]
 [% FOREACH node IN CCM.contents.Nodes %]
 NodeName=[% node.NodeName.join(',') %] [% -%]

diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/helpers.tt b/ncm-metaconfig/src/main/metaconfig/slurm/helpers.tt
@@ -0,0 +1,13 @@
+[% FOREACH pair IN CCM.contents.pairs %]
+[%- IF NOT pair.key.match('^(Default|Nodes)$') -%]
+[% pair.key %]=[% INCLUDE 'metaconfig/slurm/value.tt' key=pair.key value=pair.value flavour='config' %]
+[%- END -%]
+[% END %]
+[% FOREACH pair IN CCM.contents.Default %]
+[%- pair.key %]=[% INCLUDE 'metaconfig/slurm/value.tt' key=pair.key value=pair.value flavour='config' %] [% -%]
+[%- END %]
+[% FOREACH node IN CCM.contents.Nodes %]
+NodeName=[% node.NodeName.join(',') %] [% -%]
+[%- node.delete('NodeName'); 
+ INCLUDE 'metaconfig/slurm/params.tt' data=node boolvalue=1 join=' ' -%]
+[%- END %]
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/oci.tt b/ncm-metaconfig/src/main/metaconfig/slurm/oci.tt
@@ -0,0 +1,9 @@
+[% FOREACH pair IN CCM.contents.pairs %]
+[%- IF pair.key == 'SrunArgs' -%]
+[%- FOREACH p IN pair.value; -%]
+[% pair.key %]=[% INCLUDE 'metaconfig/slurm/value.tt' key=pair.key value=p flavour='config' %]
+[% END %]
+[%- ELSE -%]
+[% pair.key %]=[% INCLUDE 'metaconfig/slurm/value.tt' key=pair.key value=pair.value flavour='config' %]
+[% END %]
+[%- END %]
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/helpers.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/helpers.pan
@@ -0,0 +1,13 @@
+unique template metaconfig/slurm/helpers;
+
+include 'components/metaconfig/config';
+include 'metaconfig/slurm/schema';
+
+bind "/software/components/metaconfig/services/{/etc/slurm/helpers.conf}/contents" = slurm_helpers_conf;
+
+prefix "/software/components/metaconfig/services/{/etc/slurm/helpers.conf}";
+"owner" = "root";
+"group" = "root";
+"mode" = 0644;
+"module" = "slurm/helpers";
+"daemons/slurmd" = "restart";
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/mpi.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/mpi.pan
@@ -0,0 +1,13 @@
+unique template metaconfig/slurm/mpi;
+
+include 'components/metaconfig/config';
+include 'metaconfig/slurm/schema';
+
+bind "/software/components/metaconfig/services/{/etc/slurm/mpi.conf}/contents" = slurm_mpi_conf;
+
+prefix "/software/components/metaconfig/services/{/etc/slurm/mpi.conf}";
+"owner" = "root";
+"group" = "root";
+"mode" = 0644;
+"module" = "slurm/acct_gather";
+"daemons/slurmd" = "restart";
diff --git a/ncm-metaconfig/src/main/metaconfig/slurm/pan/oci.pan b/ncm-metaconfig/src/main/metaconfig/slurm/pan/oci.pan
@@ -0,0 +1,13 @@
+unique template metaconfig/slurm/oci;
+
+include 'components/metaconfig/config';
+include 'metaconfig/slurm/schema';
+
+bind "/software/components/metaconfig/services/{/etc/slurm/oci.conf}/contents" = slurm_oci_conf;
+
+prefix "/software/components/metaconfig/services/{/etc/slurm/oci.conf}";
+"owner" = "root";
+"group" = "root";
+"mode" = 0644;
+"module" = "slurm/oci";
+"daemons/slurmd" = "restart";