Relax gres configuration validation to allow multiple conf keys

Author: jovial

tasks/validate.yml

@@ -21,23 +21,30 @@
   delegate_to: localhost
   run_once: true
 
-- name: Check gres configuration when gres_autodetect is set
+- name: Check 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(', ') }}
+      Each list item in the gres dictionary of your nodegroup definition must
+      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') }}"
     _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: One of the gres dictionaries does not contain a file key and gres_autodetect is off.
+        condition: "{{ item.gres | rejectattr('file', 'defined') | length > 0 }}"
+        when: "{{ gres_autodetect == 'off' }}"
+      - msg: One of the gres dictionaries contains a file key and gres_autodetect is set.
+        condition: "{{ item.gres | selectattr('file', 'defined') | length > 0 }}"
+        when: "{{ gres_autodetect != 'off' }}"
+      - msg: One of the gres dictionaries does not contain a conf key
+        condition: "{{ item.gres | 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