Skip to content

Commit 7272b52

Browse files
committed
Remove logic for SysVinit
Only SystemD OS are supported Signed-off-by: Luca Carrogu <[email protected]>
1 parent 1dc6711 commit 7272b52

14 files changed

+21
-386
lines changed

CHANGELOG.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@ This file is used to list changes made in each version of the AWS ParallelCluste
88

99
**CHANGES**
1010
- Change supervisord service script from SysVinit to Systemd.
11+
- Drop support for SysVinit. Only Systemd is supported.
1112
- Do not configure GPUs in Slurm when Nvidia driver is not installed.
1213
-
1314
**BUG FIXES**
1415
- Fix supervisord service not enabled on Ubuntu.
1516

16-
3.x.x
17-
------
18-
19-
**CHANGES**
20-
- Do not configure GPUs in Slurm when Nvidia driver is not installed.
21-
2217
3.0.0
2318
------
2419

files/default/slurm-init

Lines changed: 0 additions & 309 deletions
This file was deleted.

libraries/helpers.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,7 @@ def find_rhel_minor_version
332332
# Return chrony service reload command
333333
# Chrony doesn't support reload but only force-reload command
334334
def chrony_reload_command
335-
case node['init_package']
336-
when 'init'
337-
chrony_reload_command = "service #{node['cluster']['chrony']['service']} force-reload"
338-
when 'systemd'
339-
chrony_reload_command = "systemctl force-reload #{node['cluster']['chrony']['service']}"
340-
else
341-
raise "Init package #{node['init_package']} not supported."
342-
343-
end
344-
345-
chrony_reload_command
335+
"systemctl force-reload #{node['cluster']['chrony']['service']}"
346336
end
347337

348338
# Add an external package repository to the OS's package manager

recipes/base_install.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
owner 'root'
128128
group 'root'
129129
mode '0644'
130-
only_if { node['init_package'] == 'systemd' }
131130
end
132131

133132
include_recipe 'aws-parallelcluster::ec2_udev_rules'
@@ -181,7 +180,6 @@
181180
owner "root"
182181
group "root"
183182
mode "0644"
184-
only_if { node['init_package'] == 'systemd' }
185183
end
186184

187185
# AMI cleanup script

recipes/compute_slurm_config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,4 @@
4444
group 'root'
4545
mode '0644'
4646
action :create
47-
only_if { node['init_package'] == 'systemd' }
4847
end

recipes/compute_slurm_finalize.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,14 @@
2727
mode '0644'
2828
end
2929

30-
slurm_service_binary = if node['init_package'] == 'systemd'
31-
"slurmd"
32-
else
33-
"slurm"
34-
end
35-
36-
template "/etc/sysconfig/#{slurm_service_binary}" do
30+
template "/etc/sysconfig/slurmd" do
3731
source 'slurm/slurm.sysconfig.erb'
3832
user 'root'
3933
group 'root'
4034
mode '0644'
4135
end
4236

43-
service slurm_service_binary do
37+
service 'slurmd' do
4438
supports restart: false
4539
action %i[enable start]
4640
not_if { node['kitchen'] }

0 commit comments

Comments
 (0)