Skip to content

Commit 5a7608b

Browse files
authored
Upgrade to OpenHPC/Slurm versions RL9=3.1.1/24.11.5 RL8=2.9.1/23.11.11 (#668)
* bump OpenHPC snapshots to v3.1.1 (slurm 24.11.5) and v2.9.1 (slurm 23.11.11) for CVE-2025-43904 * bump CI image * extend timeout for slurmdbd startup to cope with major version upgrade on startup
1 parent 01b5aa8 commit 5a7608b

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cluster_image": {
3-
"RL8": "openhpc-RL8-250506-1259-abb6394b",
4-
"RL9": "openhpc-RL9-250506-1259-abb6394b"
3+
"RL8": "openhpc-RL8-250513-1045-ca44f898",
4+
"RL9": "openhpc-RL9-250513-1046-ca44f898"
55
}
66
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,8 @@ ohpc_openhpc_repos:
5757
ohpc_default_extra_repos:
5858
"9": []
5959
"8": []
60+
61+
# systemd.service.unit.TimeoutStartSec to wait for slurmdbd startup
62+
# Set long enought to avoid problems with a major version upgrade
63+
# Currently implemented in environments/common/inventory/group_vars/all/systemd.yml
64+
openhpc_slurmdbd_timeout_start_sec: '45 minutes'

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
_systemd_requiresmount_statedir: |
2+
{% if appliances_state_dir is defined %}
23
[Unit]
34
RequiresMountsFor={{ appliances_state_dir | default('') }}
5+
{% endif %}
46
5-
_systemd_dropins_statedir:
6-
# mysql not included as role handles state dir correctly
7+
systemd_dropins:
8+
# NB: mysql does not need _systemd_requiresmount_statedir as role handles state dir correctly
79
opensearch:
810
group: opensearch
911
content: "{{ _systemd_requiresmount_statedir }}"
@@ -12,12 +14,16 @@ _systemd_dropins_statedir:
1214
content: "{{ _systemd_requiresmount_statedir }}"
1315
slurmdbd:
1416
group: openhpc
15-
content: "{{ _systemd_requiresmount_statedir }}"
17+
content: |
18+
{{ _systemd_requiresmount_statedir }}
19+
20+
[Service]
21+
# Allow slurmdbd to complete major version upgrades
22+
TimeoutStartSec={{ openhpc_slurmdbd_timeout_start_sec }}
23+
1624
slurmctld:
1725
group: openhpc
1826
content: "{{ _systemd_requiresmount_statedir }}"
1927
prometheus:
2028
group: prometheus
2129
content: "{{ _systemd_requiresmount_statedir }}"
22-
23-
systemd_dropins: "{{ _systemd_dropins_statedir if appliances_state_dir is defined else {} }}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ appliances_pulp_repos:
6363
openhpc_updates:
6464
'8':
6565
path: OpenHPC/2/updates/EL_8
66-
timestamp: 20241218T154614
66+
timestamp: 20250512T003315
6767
'9':
6868
path: OpenHPC/3/updates/EL_9
69-
timestamp: 20241218T154614
69+
timestamp: 20250510T003301
7070
grafana:
7171
'8':
7272
path: grafana/oss/rpm

0 commit comments

Comments
 (0)