refining comments and task names

Author: bertiethorpe

.github/workflows/stackhpc.yml

@@ -178,7 +178,7 @@ jobs:
           ansible-playbook -v ansible/site.yml
           ansible-playbook -v ansible/ci/check_slurm.yml
 
-      - name: Test compute node reimage, compute-init, and reboot
+      - name: Test compute node reboot and compute-init
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate

ansible/adhoc/reboot_via_slurm.yml

@@ -1,8 +1,9 @@
-# Reboot compute nodes via slurm. The nodes will be rebuilt if image in hostvars is different to the active one in OpenStack.
+# Reboot compute nodes via slurm. Nodes will be rebuilt if `image_id` in inventory is different to the currently-provisioned image.
 # Example:
 #   ansible-playbook -v ansible/adhoc/reboot_via_slurm.yml
 
 - hosts: login
+  run_once: true
   become: yes
   gather_facts: no
   tasks:
@@ -14,7 +15,7 @@
       register: slurm_result
       failed_when: slurm_result.rc != 0
 
-    - name: Fetch Slurm logs if reboot fails
+    - name: Fetch Slurm controller logs if reboot fails
       ansible.builtin.shell: |
         journalctl -u slurmctld --since "10 minutes ago" | tail -n 50
       become_user: root

environments/common/inventory/group_vars/all/openhpc.yml

@@ -35,7 +35,7 @@ openhpc_config_default:
   SlurmctldParameters:
     - enable_configless
   TaskPlugin: task/cgroup,task/affinity
-  ReturnToService: 2
+  ReturnToService: 2 # is stackhpc.openhpc default, but templating bug means it is needed here too
 openhpc_config_rebuild:
   RebootProgram: /opt/slurm-tools/bin/slurm-openstack-rebuild
   SlurmctldParameters:

environments/common/inventory/groups

@@ -62,6 +62,9 @@ mysql
 # All hosts requiring control of SELinux status.
 cluster
 
+[rebuild]
+# Enable rebuild of nodes on an OpenStack cloud; add 'control' group.
+
 [update]
 # All hosts to (optionally) run yum update on.
 
@@ -162,6 +165,3 @@ extra_packages
 
 [pulp]
 # Add builder to this group to enable automatically syncing of pulp during image build
-
-[rebuild]
-# Enable rebuild of nodes on an OpenStack cloud; add 'control' group.

environments/common/layouts/everything

@@ -25,6 +25,8 @@ control
 [filebeat:children]
 slurm_stats
 
+# NB: [rebuild] not defined here as likely to need features not currently supported
+
 [update:children]
 
 [fail2ban:children]
@@ -109,5 +111,3 @@ control
 [extra_packages:children]
 # Hosts to install specified additional packages on
 builder
-
-# NB: [rebuild] not defined here as likely to need features not currently supported