address PR comments

Author: sjpb

ansible/fatimage.yml

@@ -6,7 +6,6 @@
   tasks:
     - name: Report hostname (= final image name)
       command: hostname
-      register: _hostname
 
 - name: Run pre.yml hook
   vars:

ansible/roles/cve-2023-41914/tasks/pre-upgrade.yml

@@ -1,14 +1,20 @@
-- name: Shut down slurm
+- name: Stop slurmd
   systemd:
-    name: "{{ item }}"
+    name: slurmd
     state: stopped
-  register: _stop
-  failed_when: "'msg' in _stop and 'Could not find the requested service' not in _stop.msg"
-  # ignore_errors: true
-  loop:
-    - slurmd
-    - slurmctld
-    - slurmdbd
+  when: openhpc_enable.batch | default('false') | bool or 'login' in group_names
+
+- name: Stop slurmctld
+  systemd:
+    name: slurmctld
+    state: stopped
+  when: openhpc_enable.control | default('false') | bool
+
+- name: Stop slurmdbd
+  systemd:
+    name: slurmdbd
+    state: stopped
+  when: openhpc_enable.database | default('false') | bool
 
 - name: Ensure backup directory exists
   file:

ansible/roles/cve-2023-41914/tasks/validate.yml

@@ -5,9 +5,6 @@
   # this is a subset (same format) as ansible_facts.packages
   set_fact:
     _cve_2023_41814_installed_pkgs: "{{ ansible_facts.packages | dict2items | selectattr('key', 'match', 'slurm-') | items2dict }}"
-  
-# - debug:
-#     var: _cve_2023_41814_installed_pkgs
 
 - name: Ensure only a single version of all slurm-* packages is installed
   assert: