Revert "Backport update slurmctld and slurmd systemd service files"

This reverts commit a5cdad2.
Revert the commit becauses of update of the slurm files are only require when upgrade to 21.08
See #1473
and d264c6b

Author: chenwany

CHANGELOG.md

@@ -15,7 +15,6 @@ This file is used to list changes made in each version of the AWS ParallelCluste
   - Libfabric-aws: `libfabric-aws-1.16.0~amzn4.0-1`
   - Rdma-core: `rdma-core-41.0-2`
   - Open MPI: `openmpi40-aws-4.1.4-2`
-- Update slurmctld and slurmd systemd service files.
 
 2.11.7
 -----

files/default/slurmctld.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Slurm controller daemon
-After=network-online.target munge.service
-Wants=network-online.target
+After=network.target munge.service
 ConditionPathExists=/opt/slurm/etc/slurm.conf
 
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/slurmctld
-ExecStart=/opt/slurm/sbin/slurmctld -D -s $SLURMCTLD_OPTIONS
+ExecStart=/opt/slurm/sbin/slurmctld -D $SLURMCTLD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 LimitNOFILE=562930
 LimitMEMLOCK=infinity

files/default/slurmd.service

@@ -1,13 +1,12 @@
 [Unit]
 Description=Slurm node daemon
-After=munge.service network-online.target remote-fs.target
-Wants=network-online.target
+After=munge.service network.target remote-fs.target
 ConditionPathExists=/opt/slurm/etc/slurm.conf
 
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/slurmd
-ExecStart=/opt/slurm/sbin/slurmd -D -s $SLURMD_OPTIONS
+ExecStart=/opt/slurm/sbin/slurmd -D $SLURMD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 LimitNOFILE=131072