use NodeSets internally to simplify templating

Author: sjpb

templates/slurm.conf.j2

@@ -27,6 +27,7 @@ NodeName={{ node }}
 {%          set hostlists = (inventory_group_hosts | hostlist_expression) %}{# hosts in inventory group aren't necessarily a single hostlist expression #}
 {%              for hostlist in  hostlists %}
 NodeName={{ hostlist }} {{ '' -}}
+    Feature={{ nodegroup.name }} {{ '' -}}
     State=UNKNOWN {{ '' -}}
     RealMemory={{ nodegroup.ram_mb | default(ram_mb) }} {{ '' -}}
     Sockets={{first_host_hv['ansible_processor_count'] }} {{ '' -}}
@@ -37,7 +38,7 @@ NodeName={{ hostlist }} {{ '' -}}
 {%              endfor %}{# hostlists #}
 {%      endif %}{# 1 or more hosts in inventory #}
 
-NodeSet={{ nodegroup.name }} Nodes={{ ','.join(hostlists | default(['""'])) }}{# no support for creating nodesets by Feature #}
+NodeSet={{ nodegroup.name }} Feature={{ nodegroup.name }}
 
 {% endfor %}
 
@@ -49,7 +50,8 @@ NodeName=nonesuch
 PartitionName={{partition.name}} {{ '' -}}
     Default={{ partition.get('default', 'YES') }} {{ '' -}}
     MaxTime={{ partition.get('maxtime', openhpc_job_maxtime) }} {{ '' -}}
-    State=UP Nodes={{ partition.get('groups', [partition.name]) | join(',') }} {{ '' -}}
+    State=UP  {{ '' -}}
+    Nodes={{ partition.get('groups', [partition.name]) | join(',') }} {{ '' -}}
     {{ partition.params | default({}) | dict2parameters }}
 {% endfor %}{# openhpc_partitions #}