Merge remote-tracking branch 'origin/feat/nodegroups' into HEAD

Author: jovial

.github/workflows/ci.yml

@@ -59,7 +59,6 @@ jobs:
           - test11
           - test12
           - test13
-          - test14
         exclude:
           # mariadb package provides /usr/bin/mysql on RL8 which doesn't work with geerlingguy/mysql role
           - scenario: test4

molecule/README.md

@@ -10,7 +10,7 @@ test1  | 1            | N                       | 2x compute node, sequential na
 test1b | 1            | N                       | 1x compute node
 test1c | 1            | N                       | 2x compute nodes, nonsequential names
 test2  | 2            | N                       | 4x compute node, sequential names
-test3  | 1            | Y                       | -
+test3  | 1            | Y                       | 4x compute nodes in 2x groups, single partition
 test4  | 1            | N                       | 2x compute node, accounting enabled
 test5  | 1            | N                       | As for #1 but configless
 test6  | 1            | N                       | 0x compute nodes, configless
@@ -21,7 +21,7 @@ test10 | 1            | N                       | As for #5 but then tries to ad
 test11 | 1            | N                       | As for #5 but then deletes a node (actually changes the partition due to molecule/ansible limitations)
 test12 | 1            | N                       | As for #5 but enabling job completion and testing `sacct -c`
 test13 | 1            | N                       | As for #5 but tests `openhpc_config` variable.
-test14 | 1            | N                       | As for #5 but also tests `extra_nodes` via State=DOWN nodes.
+test14 | 1            | N                       | [removed, extra_nodes removed]
 test15 | 1            | Y                       | As for #5 but also tests `partitions with different name but with the same NodeName`.
 
 

molecule/test14/converge.yml

@@ -8,14 +8,15 @@
       runtime: true
     openhpc_slurm_control_host: "{{ groups['testohpc_login'] | first }}"
     openhpc_nodegroups:
-      - name: "compute"
+      - name: grp1
+      - name: grp2
+    openhpc_partitions:
+      - name: compute
         groups:
-        - name: "grp1"
-        - name: "grp2"
+          - grp1
+          - grp2
     openhpc_cluster_name: testohpc
   tasks:
     - name: "Include ansible-role-openhpc"
       include_role:
         name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}"
-      
-

molecule/test14/molecule.yml

@@ -6,6 +6,8 @@
       - openhpc_cluster_name is defined
       - openhpc_cluster_name != ''
     fail_msg: openhpc role variables not correctly defined, see detail above
+  delegate_to: localhost
+  run_once: true
 
 - name: Check no host appears in more than one nodegroup
   assert:
@@ -15,9 +17,13 @@
       {{ _openhpc_check_hosts | dict2items | rejectattr('value', 'equalto', 1) | items2dict | to_nice_yaml }}
   vars:
     _openhpc_node_inventory_groups: "{{ openhpc_nodegroups | map(attribute='name') | map('regex_replace', '^', openhpc_cluster_name ~ '_') }}"
-    _openhpc_check_hosts: "{{ _openhpc_node_inventory_groups | map('extract', groups) | flatten | community.general.counter }}"
+    _openhpc_check_hosts: "{{ groups | dict2items | list | selectattr('key', 'in', _openhpc_node_inventory_groups) | map(attribute='value') | flatten | community.general.counter }}"
+  delegate_to: localhost
+  run_once: true
 
 - name: Fail if configuration is old
   assert:
     that: openhpc_slurm_partitions is not defined
     fail_msg: stackhpc.openhpc parameter openhpc_slurm_partitions has been replaced - see openhpc_nodegroups and openhpc_partitions
+  delegate_to: localhost
+  run_once: true

molecule/test14/verify.yml

@@ -146,8 +146,8 @@ PropagateResourceLimitsExcept=MEMLOCK
 Epilog=/etc/slurm/slurm.epilog.clean
 
 # COMPUTE NODES
-# OpenHPC default configuration
 {% for nodegroup in openhpc_nodegroups %}
+# nodegroup: {{ nodegroup.name }}
 {%  set inventory_group_name = openhpc_cluster_name ~ '_' ~ nodegroup.name %}
 {%  set inventory_group_hosts = groups.get(inventory_group_name, []) %}
 {%      if inventory_group_hosts | length > 0 %}
@@ -166,9 +166,9 @@ NodeName={{ hostlist }} {{ '' -}}
     ThreadsPerCore={{ first_host_hv['ansible_processor_threads_per_core'] }} {{ '' -}}
     {{ nodegroup.node_params | default({}) | dict2parameters }} {{ '' -}}
     {% if 'gres' in nodegroup %}Gres={{ ','.join(nodegroup.gres | map(attribute='conf')) }}{% endif %}
+
 {%              endfor %}{# hostlists #}
 {%      endif %}{# 1 or more hosts in inventory #}
-
 NodeSet=nodegroup_{{ nodegroup.name }} Feature=nodegroup_{{ nodegroup.name }}
 
 {% endfor %}