improve readability of group_vars

Author: bertiethorpe

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

@@ -31,19 +31,16 @@ openhpc_packages_extra: []
 openhpc_packages: "{{ openhpc_packages_default + openhpc_packages_extra }}"
 openhpc_munge_key: "{{ vault_openhpc_mungekey | b64decode }}"
 openhpc_login_only_nodes: login
-openhpc_config_default: >-
-  {{
-    {
-      'SlurmctldParameters': ['enable_configless'] +
-                             (['reboot_from_controller'] if groups['rebuild'] | length > 0 else []),
-      'TaskPlugin': 'task/cgroup,task/affinity'
-    }
-    | combine(
-      {'RebootProgram': '/opt/slurm-tools/bin/slurm-openstack-rebuild'} if groups['rebuild'] | length > 0 else {}
-    )
-  }}
+openhpc_config_default:
+  SlurmctldParameters:
+    - enable_configless
+  TaskPlugin: task/cgroup,task/affinity
+openhpc_config_reboot:
+  RebootProgram: /opt/slurm-tools/bin/slurm-openstack-rebuild
+  SlurmctldParameters:
+    - reboot_from_controller
 openhpc_config_extra: {}
-openhpc_config: "{{ openhpc_config_default | combine(openhpc_config_extra, list_merge='append') }}"
+openhpc_config: "{{ openhpc_config_default | combine(openhpc_config_reboot if groups['rebuild'] | length > 0 else {}, openhpc_config_extra, list_merge='append') }}"
 openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if appliances_state_dir is defined else '/var/spool' }}"
 
 openhpc_install_type: ohpc # 'ohpc' or 'generic', see https://github.com/stackhpc/ansible-slurm-appliance/pull/326

environments/common/inventory/groups

@@ -164,4 +164,4 @@ extra_packages
 # 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 plus 'compute' group or a subset of it.
+# Enable rebuild of nodes on an OpenStack cloud; add 'control' group.