Merge branch 'confserver' into 'master'

conf-server parameter finally accepts the backup crtl as parameter as well

See merge request !562

roles/slurm-start/templates/slurmd.service.j2

@@ -10,7 +10,7 @@ KillMode=process
 LimitMEMLOCK=infinity
 #EnvironmentFile=/etc/default/slurmd
 #ExecStart={{ slurm_dir }}/sbin/slurmd $SLURMD_OPTIONS # before slurm20
-ExecStart={{ slurm_dir }}/sbin/slurmd --conf-server {{ slurmctrl }}:6817
+ExecStart={{ slurm_dir }}/sbin/slurmd --conf-server {{ slurmctrl }}:6817,{{ slurmctrlbackup }}:6817
 PIDFile={{ slurmpiddir }}/slurmd.pid
 
 [Install]

roles/slurm-start/templates/slurmd.service.secondary.j2

-[Unit]
-Description=Slurm node daemon
-After=network.target
-# After Slurm-20.02 (configless), this is not needed
-# ConditionPathExists={{ slurm_dir }}/etc/slurm.conf
-
-[Service]
-Type=forking
-KillMode=process
-LimitMEMLOCK=infinity
-#EnvironmentFile=/etc/default/slurmd
-#ExecStart={{ slurm_dir }}/sbin/slurmd $SLURMD_OPTIONS # before slurm20
-ExecStart={{ slurm_dir }}/sbin/slurmd --conf-server {{ slurmctrlbackup }}:6817
-PIDFile={{ slurmpiddir }}/slurmd.pid
-
-[Install]
-WantedBy=multi-user.target