From f574568d76b1c18b9e0f24396bba1fb40ff36c32 Mon Sep 17 00:00:00 2001 From: Aditya Ujeniya Date: Wed, 23 Oct 2024 10:17:42 +0200 Subject: [PATCH] Working rest service --- slurm/base/Dockerfile | 2 +- slurm/rest/docker-entrypoint.sh | 9 ++++++++- slurm/rest/slurmrestd.conf | 4 +--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/slurm/base/Dockerfile b/slurm/base/Dockerfile index caa8fde..fb9ae62 100644 --- a/slurm/base/Dockerfile +++ b/slurm/base/Dockerfile @@ -27,7 +27,7 @@ RUN dnf --enablerepo=powertools install -y munge-devel rrdtool-devel lua-devel h RUN mkdir -p /usr/local/slurm-tmp \ && cd /usr/local/slurm-tmp \ && wget https://download.schedmd.com/slurm/slurm-${SLURM_VERSION}.tar.bz2 \ - && rpmbuild -ta --with slurmrestd slurm-${SLURM_VERSION}.tar.bz2 + && rpmbuild -ta --with slurmrestd --with jwt slurm-${SLURM_VERSION}.tar.bz2 RUN ARCH=$(uname -m) \ && yum -y --nogpgcheck localinstall \ diff --git a/slurm/rest/docker-entrypoint.sh b/slurm/rest/docker-entrypoint.sh index 0cdca57..f5ef0dd 100755 --- a/slurm/rest/docker-entrypoint.sh +++ b/slurm/rest/docker-entrypoint.sh @@ -54,6 +54,10 @@ _slurmrestd() { echo "" # mkdir -p /var/spool/slurm/ctld /var/spool/slurm/d /var/log/slurm /etc/slurm # chown -R slurm: /var/spool/slurm/ctld /var/spool/slurm/d /var/log/slurm + + mkdir -p /etc/config /var/spool/slurm /var/spool/slurm/restd /var/spool/slurm/restd/rest + chown -R slurm: /etc/config /var/spool/slurm /var/spool/slurm/restd /var/spool/slurm/restd/rest + touch /var/log/slurmrestd.log chown slurm: /var/log/slurmrestd.log if [[ ! -f /home/config/slurmrestd.conf ]]; then @@ -62,9 +66,12 @@ _slurmrestd() { else echo "### use provided slurmrestd.conf ###" cp /home/config/slurmrestd.conf /etc/config/slurmrestd.conf + cp /home/config/slurm.conf /etc/config/slurm.conf + fi sleep 2s - /usr/sbin/slurmrestd -f /etc/config/slurmrestd.conf 0.0.0.0:6820 -Dvv + export SLURMRESTD=/var/spool/slurm/restd/rest + /usr/sbin/slurmrestd -f /etc/config/slurmrestd.conf -s dbv0.0.39,v0.0.39 -vv -u slurm 0.0.0.0:6820 } ### main ### diff --git a/slurm/rest/slurmrestd.conf b/slurm/rest/slurmrestd.conf index a747d11..8755372 100644 --- a/slurm/rest/slurmrestd.conf +++ b/slurm/rest/slurmrestd.conf @@ -1,6 +1,4 @@ # # Example slurmdbd.conf file. # -include /etc/slurm/slurm.conf - -AuthType=auth/munge \ No newline at end of file +include /etc/config/slurm.conf