Merge branch 'devel' into 'main'

slurm

See merge request glicid-public/guix-glicid!159
This commit is contained in:
Jean-François GUILLAUME 2022-11-30 16:25:18 +00:00
commit 748545ae3a

View file

@ -29,8 +29,7 @@
slurmd-service-type slurmd-service-type
%slurm-group %slurm-group
%slurm-account %slurm-account
%slurm-accounts %slurm-accounts ))
))
; ;
; Munged ; Munged
; ;
@ -58,16 +57,14 @@
"-f" ; until we fix the permissions "-f" ; until we fix the permissions
"--key-file" #$key-file "--key-file" #$key-file
) )
#:log-file #$log-file #:log-file #$log-file ))
))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %munged-activation (define %munged-activation
#~(begin #~(begin
(mkdir-p "/var/run/munge") (mkdir-p "/var/run/munge")
(mkdir-p "/var/lib/munge") (mkdir-p "/var/lib/munge")
#t #t ))
))
(define munged-service-type (define munged-service-type
(service-type (service-type
@ -90,8 +87,7 @@
(home-directory "/var/spool/slurm") (home-directory "/var/spool/slurm")
(shell (file-append bash "/bin/bash")))) (shell (file-append bash "/bin/bash"))))
(define %slurm-accounts (define %slurm-accounts (list %slurm-group %slurm-account))
(list %slurm-group %slurm-account))
; ;
; slurmdbd ; slurmdbd
@ -100,9 +96,9 @@
<slurmdbd-configuration> <slurmdbd-configuration>
slurmdbd-configuration make-slurmdbd-configuration slurmdbd-configuration make-slurmdbd-configuration
slurmdbd-configuration? slurmdbd-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmdbd-conf slurmdbd-slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf"))) (slurmdbd-conf slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf")))
(log-file slurmdbd-log-file (default "/var/log/slurm/slurmdbd.log"))) (log-file log-file (default "/var/log/slurm/slurmdbd.log")))
(define slurmdbd-service (define slurmdbd-service
(match-lambda (match-lambda
@ -116,12 +112,10 @@
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
(list (list
#$(file-append slurm "/sbin/slurmdbd") #$(file-append slurm "/sbin/slurmdbd")
"-D" "-D" )
)
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid (getpwnam "slurm"))
#:group (passwd:gid (getpwnam "slurm")) #:group (passwd:gid (getpwnam "slurm"))))
))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmdbd-activation (define %slurmdbd-activation
@ -144,8 +138,7 @@
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600) (chmod slurm-file #o600)
)(find-files "/etc/slurm/")) )(find-files "/etc/slurm/"))
#t #t ))
))
(define slurmdbd-service-type (define slurmdbd-service-type
(service-type (service-type
@ -163,9 +156,9 @@
<slurmctld-configuration> <slurmctld-configuration>
slurmctld-configuration make-slurmctld-configuration slurmctld-configuration make-slurmctld-configuration
slurmctld-configuration? slurmctld-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmctld-conf slurmctld-slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf"))) (slurmctld-conf slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf")))
(log-file slurmctld-log-file (default "/var/log/slurm/slurmctld.log"))) (log-file log-file (default "/var/log/slurm/slurmctld.log")))
(define slurmctld-service (define slurmctld-service
(match-lambda (match-lambda
@ -180,12 +173,10 @@
(list (list
#$(file-append slurm "/sbin/slurmctld") #$(file-append slurm "/sbin/slurmctld")
"-D" "-R" "-D" "-R"
"-f" #$slurmctld-conf "-f" #$slurmctld-conf )
)
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid (getpwnam "slurm"))
#:group (passwd:gid (getpwnam "slurm")) #:group (passwd:gid (getpwnam "slurm"))))
))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmctld-activation (define %slurmctld-activation
@ -226,12 +217,11 @@
<slurmd-configuration> <slurmd-configuration>
slurmd-configuration make-slurmd-configuration slurmd-configuration make-slurmd-configuration
slurmd-configuration? slurmd-configuration?
(slurm slurm-configuration-slurm (default slurm)) (slurm slurm (default slurm))
(slurmd-conf slurmd-slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-file slurmd-log-file (default "/var/log/slurm/slurmd.log")) (log-file log-file (default "/var/log/slurm/slurmd.log"))
(slurmctld-host slurmd-slurmctld-host (default #f)); string slurmctld-host[:port] (slurmctld-host slurmctld-host (default #f))
(log-level slurmd-log-level (default #f)); string Verbose mode. Multiple -v's increase verbosity (log-level log-level (default #f)))
)
(define slurmd-service (define slurmd-service
(match-lambda (match-lambda
@ -248,16 +238,11 @@
"-D" "-D"
#$@(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)
'() '()))
) #:log-file #$log-file ))
)
#:log-file #$log-file
))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmd-activation (define %slurmd-activation