testing nested if for configless slurmd

This commit is contained in:
Jean-François GUILLAUME 2023-01-10 11:24:53 +01:00
parent 5d77b3c76a
commit cb090f9787
GPG key ID: 38751DAE145EFB5A

View file

@ -201,20 +201,24 @@
(slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-file log-file (default "/var/log/slurm/slurmd.log")) (log-file log-file (default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmctld-host (default #f)) (slurmctld-host slurmctld-host (default #f))
(configless configless (default #f))
(log-level log-level (default #f))) (log-level log-level (default #f)))
(define slurmd-service (define slurmd-service
(match-lambda (match-lambda
(($ <slurmd-configuration> slurm slurmd-conf slurmctld-host log-file log-level) (($ <slurmd-configuration> slurm slurmd-conf slurmctld-host configless log-file log-level)
(list (shepherd-service (provision '(slurmd)) (list (shepherd-service (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmd") (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmd")
"-D" "-D"
#$@(if configless
'()
(list
#$@(if slurmctld-host #$@(if slurmctld-host
(list (string-append "--conf-server" slurmctld-host)) (list (string-append "--conf-server" slurmctld-host))
(list (string-append "-f" slurmd-conf))) (list (string-append "-f" slurmd-conf)))))
#$@(if log-level #$@(if log-level
(list log-level) (list log-level)
'())) '()))