Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cluster_image": {
"RL8": "openhpc-RL8-250506-1259-abb6394b",
"RL9": "openhpc-RL9-250506-1259-abb6394b"
"RL8": "openhpc-RL8-250513-1045-ca44f898",
"RL9": "openhpc-RL9-250513-1046-ca44f898"
}
}
5 changes: 5 additions & 0 deletions environments/common/inventory/group_vars/all/openhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@ ohpc_openhpc_repos:
ohpc_default_extra_repos:
"9": []
"8": []

# systemd.service.unit.TimeoutStartSec to wait for slurmdbd startup
# Set long enought to avoid problems with a major version upgrade
# Currently implemented in environments/common/inventory/group_vars/all/systemd.yml
openhpc_slurmdbd_timeout_start_sec: '45 minutes'
16 changes: 11 additions & 5 deletions environments/common/inventory/group_vars/all/systemd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
_systemd_requiresmount_statedir: |
{% if appliances_state_dir is defined %}
[Unit]
RequiresMountsFor={{ appliances_state_dir | default('') }}
{% endif %}

_systemd_dropins_statedir:
# mysql not included as role handles state dir correctly
systemd_dropins:
# NB: mysql does not need _systemd_requiresmount_statedir as role handles state dir correctly
opensearch:
group: opensearch
content: "{{ _systemd_requiresmount_statedir }}"
Expand All @@ -12,12 +14,16 @@ _systemd_dropins_statedir:
content: "{{ _systemd_requiresmount_statedir }}"
slurmdbd:
group: openhpc
content: "{{ _systemd_requiresmount_statedir }}"
content: |
{{ _systemd_requiresmount_statedir }}

[Service]
# Allow slurmdbd to complete major version upgrades
TimeoutStartSec={{ openhpc_slurmdbd_timeout_start_sec }}

slurmctld:
group: openhpc
content: "{{ _systemd_requiresmount_statedir }}"
prometheus:
group: prometheus
content: "{{ _systemd_requiresmount_statedir }}"

systemd_dropins: "{{ _systemd_dropins_statedir if appliances_state_dir is defined else {} }}"
4 changes: 2 additions & 2 deletions environments/common/inventory/group_vars/all/timestamps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ appliances_pulp_repos:
openhpc_updates:
'8':
path: OpenHPC/2/updates/EL_8
timestamp: 20241218T154614
timestamp: 20250512T003315
'9':
path: OpenHPC/3/updates/EL_9
timestamp: 20241218T154614
timestamp: 20250510T003301
grafana:
'8':
path: grafana/oss/rpm
Expand Down