Skip to content

Don't set topology plugin if topology group not enabled #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions environments/common/inventory/group_vars/all/openhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,36 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
# NB: override in environments/site/inventory/group_vars/all/openhpc.yml, not here:
openhpc_config_extra: {}

# default additional slurm.conf parameters for the appliance:
# additional default slurm.conf parameters for the appliance:
openhpc_config_default:
TaskPlugin: task/cgroup,task/affinity
ReturnToService: 2 # workaround for templating bug TODO: Remove once on stackhpc.openhpc v1.2.0
TopologyPlugin: "topology/{{ 'tree' if (topology_nodes | length) > 0 else 'flat' }}"

# default additional slurm.conf parameters when "rebuild" enabled:
# additional default slurm.conf parameters when "rebuild" enabled:
openhpc_config_rebuild:
RebootProgram: /opt/slurm-tools/bin/slurm-openstack-rebuild
SlurmctldParameters:
- reboot_from_controller
ResumeTimeout: 300

# default additional slurm.conf parameters when "nhc" enabled:
# additional default slurm.conf parameters when "nhc" enabled:
openhpc_config_nhc:
HealthCheckProgram: /usr/sbin/nhc
HealthCheckInterval: 300
HealthCheckNodeState: NONDRAINED_IDLE

# additional default slurm.conf parameters when "topology" enabled:
openhpc_config_topology:
TopologyPlugin: topology/tree

# indirection to allow automatic construction of slurm.conf parameters:
openhpc_config_groups:
- enabled: "{{ groups['rebuild'] | length > 0 }}"
config: "{{ openhpc_config_rebuild }}"
- enabled: "{{ groups['nhc'] | length > 0 }}"
config: "{{ openhpc_config_nhc }}"
- enabled: "{{ groups['topology'] | length > 0 }}"
config: "{{ openhpc_config_topology }}"
- enabled: true
config: "{{ openhpc_config_extra }}"

Expand Down