Fix supervisord service not enabled on Ubuntu and drop SysVinit

Change supervisord service script from SysVinit to Systemd for all OS.
Add kitchen test to verify service is enabled. Also add check for other required services

Drop support for SysVinit

Only SystemD OS are supported

Signed-off-by: Luca Carrogu <[email protected]>

Author: lukeseawalker

CHANGELOG.md

@@ -6,7 +6,12 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 3.0.1
 ------
 
+**CHANGES**
+- Change supervisord service script from SysVinit to Systemd.
+- Drop support for SysVinit. Only Systemd is supported.
+
 **BUG FIXES**
+- Fix supervisord service not enabled on Ubuntu.
 - Update ca-certificates package during AMI build time and prevent Chef from using outdated/distrusted CA certificates.
 
 3.0.0

files/default/slurm-init

@@ -323,17 +323,7 @@ def find_rhel_minor_version
 # Return chrony service reload command
 # Chrony doesn't support reload but only force-reload command
 def chrony_reload_command
-  case node['init_package']
-  when 'init'
-    chrony_reload_command = "service #{node['cluster']['chrony']['service']} force-reload"
-  when 'systemd'
-    chrony_reload_command = "systemctl force-reload #{node['cluster']['chrony']['service']}"
-  else
-    raise "Init package #{node['init_package']} not supported."
-
-  end
-
-  chrony_reload_command
+  "systemctl force-reload #{node['cluster']['chrony']['service']}"
 end
 
 # Add an external package repository to the OS's package manager

libraries/helpers.rb

@@ -127,7 +127,6 @@
   owner 'root'
   group 'root'
   mode '0644'
-  only_if { node['init_package'] == 'systemd' }
 end
 
 include_recipe 'aws-parallelcluster::ec2_udev_rules'
@@ -174,13 +173,13 @@
   mode "0644"
 end
 
-# Put init script in place
-template "supervisord-init" do
-  source 'supervisord-init.erb'
-  path "/etc/init.d/supervisord"
+# Put supervisord service in place
+template "supervisord-service" do
+  source 'supervisord-service.erb'
+  path "/etc/systemd/system/supervisord.service"
   owner "root"
   group "root"
-  mode "0755"
+  mode "0644"
 end
 
 # AMI cleanup script

recipes/base_install.rb

@@ -48,5 +48,4 @@
   group 'root'
   mode '0644'
   action :create
-  only_if { node['init_package'] == 'systemd' }
 end

recipes/compute_slurm_config.rb

@@ -27,20 +27,14 @@
   mode '0644'
 end
 
-slurm_service_binary = if node['init_package'] == 'systemd'
-                         "slurmd"
-                       else
-                         "slurm"
-                       end
-
-template "/etc/sysconfig/#{slurm_service_binary}" do
+template "/etc/sysconfig/slurmd" do
   source 'slurm/slurm.sysconfig.erb'
   user 'root'
   group 'root'
   mode '0644'
 end
 
-service slurm_service_binary do
+service 'slurmd' do
   supports restart: false
   action %i[enable start]
   not_if { node['kitchen'] }