Relax gres configuration validation to allow multiple list items

Author: jovial

tasks/validate.yml

@@ -21,23 +21,35 @@
   delegate_to: localhost
   run_once: true
 
-- name: Check gres configuration when gres_autodetect is set
+- name: Check Generic Resource (GRES) configuration
   assert:
     that:
-      - _failure_reasons | selectattr('when', 'truthy') | length == 0
+      - failure_reasons | length == 0
     fail_msg: >
-      Your nodegroup definition must include a single gres dictionary containing a conf key
-      if gres_autodetect is set. The following nodegroup failed this check: {{ item }}.
-      Reasons for failure: {{ _failure_reasons | selectattr('when', 'truthy') | map(attribute='msg') | join(', ') }}
+      The gres key in your nodegroup definition must map to a list of
+      dictionaries. The dictionaries should all contain a conf key. If
+      gres_autodetect is not set, you must also include the file key.  The
+      following nodegroup failed this check: {{ item }}. Reasons for failure: 
+      {{ failure_reasons | map(attribute='msg') | join(', ') }}
   vars:
-    _openhpc_gres_autodetect_groups: "{{ openhpc_nodegroups | selectattr('gres_autodetect', 'defined') | selectattr('gres_autodetect', 'search', '(?!off).*') }}"
+    gres_autodetect: "{{ item.gres_autodetect | default('off') }}"
+    gres_items: "{{ item.gres | select('mapping') }}"
     _failure_reasons:
-      - msg: The gres key was a list with more than one item
-        when: "{{ item.gres | length != 1 }}"
-      - msg: The gres dictionary does not contain a conf key
-        when: "{{ item.gres.0.conf is not defined }}"
+      - msg: The gres key in your nodegroup defintion does not map to a list of dictionaries
+        condition: "{{ item.gres is sequence and item.gres | reject('mapping') | length > 0 }}"
+        when: true
+      - msg: One of list items in the gres dictionary does not contain a file key and gres_autodetect is off
+        condition: "{{ gres_items | rejectattr('file', 'defined') | length > 0 }}"
+        when: "{{ gres_autodetect == 'off' }}"
+      - msg: One of the list items in the gres dictionary contains a file key and gres_autodetect is set
+        condition: "{{ gres_items | selectattr('file', 'defined') | length > 0 }}"
+        when: "{{ gres_autodetect != 'off' }}"
+      - msg: One of the list items in the gres dictionary does not contain a conf key
+        condition: "{{ gres_items | rejectattr('conf', 'defined') | length > 0 }}"
+        when: true
+    failure_reasons: "{{ _failure_reasons | selectattr('when', 'truthy') | selectattr('condition', 'truthy') }}"
   delegate_to: localhost
-  loop: "{{ _openhpc_gres_autodetect_groups }}"
+  loop: "{{ openhpc_nodegroups | selectattr('gres', 'defined') }}"
   run_once: true
 
 - name: Fail if configuration is old