From 38a5b89de988996145acf24e7122124ac2194bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Thu, 29 Apr 2021 12:19:33 +0200 Subject: [PATCH] minor fixes --- roles/slurm/files/entrypoint.sh | 7 ++++--- roles/slurm/files/slurm.Dockerfile | 15 +++++++++------ roles/slurm/files/slurmctld.Dockerfile | 15 +++++++-------- roles/slurm/files/slurmd.Dockerfile | 12 ++++++++---- roles/slurm/templates/slurm.conf.j2 | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/roles/slurm/files/entrypoint.sh b/roles/slurm/files/entrypoint.sh index 26947d3..483b5e0 100644 --- a/roles/slurm/files/entrypoint.sh +++ b/roles/slurm/files/entrypoint.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash set -e -chown munge:munge /etc/munge/munge.key - -chmod 600 /etc/munge/munge.key +if [ -f "/etc/munge/munge.key" ] ; then + chown munge:munge /etc/munge/munge.key + chmod 600 /etc/munge/munge.key +fi exec "$@" diff --git a/roles/slurm/files/slurm.Dockerfile b/roles/slurm/files/slurm.Dockerfile index 20d4d2e..1846b73 100644 --- a/roles/slurm/files/slurm.Dockerfile +++ b/roles/slurm/files/slurm.Dockerfile @@ -2,25 +2,28 @@ FROM docker.io/library/centos:7 as base RUN yum install -y epel-release && \ yum install -y slurm && \ - yum clean all + yum clean all && rm -rf /var/cache/yum RUN yum install -y less iproute bind-utils nmap-ncat net-tools && \ - yum clean all + yum clean all && rm -rf /var/cache/yum COPY entrypoint.sh /usr/local/sbin/entrypoint.sh -RUN chown root:root /usr/local/sbin/entrypoint.sh && chmod 755 /usr/local/sbin/entrypoint.sh +RUN chown root:root /usr/local/sbin/entrypoint.sh && \ + chmod 755 /usr/local/sbin/entrypoint.sh ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ] FROM base as slurmd RUN yum install -y slurm-slurmd && \ - yum clean all + yum clean all && rm -rf /var/cache/yum + +CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmd -D & })' FROM base as slurmctld RUN yum install -y slurm-slurmctld && \ - yum clean all + yum clean all && rm -rf /var/cache/yum -# CMD bash -c 'cat <({ condor_master -f & tail --retry --pid $! -f /var/log/condor/MasterLog & })' +CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmctld -D & })' diff --git a/roles/slurm/files/slurmctld.Dockerfile b/roles/slurm/files/slurmctld.Dockerfile index 7f8c2bb..1d5ba1b 100644 --- a/roles/slurm/files/slurmctld.Dockerfile +++ b/roles/slurm/files/slurmctld.Dockerfile @@ -1,20 +1,19 @@ FROM docker.io/library/centos:7 as base RUN yum install -y epel-release && \ - yum install -y slurm slurm-slurmctld && \ - yum clean all + yum install -y slurm && \ + yum clean all && rm -rf /var/cache/yum RUN yum install -y less iproute bind-utils nmap-ncat net-tools && \ - yum clean all - -RUN yum install -y slurm-slurmctld && \ - yum clean all + yum clean all && rm -rf /var/cache/yum COPY entrypoint.sh /usr/local/sbin/entrypoint.sh -RUN chown root:root /usr/local/sbin/entrypoint.sh && chmod 755 /usr/local/sbin/entrypoint.sh +RUN chown root:root /usr/local/sbin/entrypoint.sh && \ + chmod 755 /usr/local/sbin/entrypoint.sh ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ] -CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmctld -D & })' +RUN yum install -y slurm-slurmctld && \ + yum clean all && rm -rf /var/cache/yum # ... & tail --retry --pid $! -f /var/log/condor/MasterLog & })' diff --git a/roles/slurm/files/slurmd.Dockerfile b/roles/slurm/files/slurmd.Dockerfile index 59d800b..a92ec21 100644 --- a/roles/slurm/files/slurmd.Dockerfile +++ b/roles/slurm/files/slurmd.Dockerfile @@ -1,17 +1,21 @@ FROM docker.io/library/centos:7 RUN yum install -y epel-release && \ - yum install -y slurm slurm-slurmd && \ - yum clean all + yum install -y slurm && \ + yum clean all && rm -rf /var/cache/yum RUN yum install -y less iproute bind-utils nmap-ncat net-tools && \ - yum clean all + yum clean all && rm -rf /var/cache/yum COPY entrypoint.sh /usr/local/sbin/entrypoint.sh -RUN chown root:root /usr/local/sbin/entrypoint.sh && chmod 755 /usr/local/sbin/entrypoint.sh +RUN chown root:root /usr/local/sbin/entrypoint.sh && \ + chmod 755 /usr/local/sbin/entrypoint.sh ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ] +RUN yum install -y slurm-slurmd && \ + yum clean all && rm -rf /var/cache/yum + # CMD bash -c 'cat <({ condor_master -f & tail --retry --pid $! -f /var/log/condor/MasterLog & })' CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmd -D & })' diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2 index 6b4c4f5..95419f6 100644 --- a/roles/slurm/templates/slurm.conf.j2 +++ b/roles/slurm/templates/slurm.conf.j2 @@ -163,4 +163,4 @@ SlurmdDebug=verbose # COMPUTE NODES NodeName=slurm-exec[1-{{num_nodes}}] CPUs=2 CoresPerSocket=2 State=UNKNOWN NodeName=slurm-submit1 CPUs=1 State=UNKNOWN -PartitionName=debug Nodes=slurm-exec[1-{{num_nodes}}] Default=YES MaxTime=INFINITE State=UP +PartitionName=debug Nodes=slurm-exec[1-{{num_nodes}}] AllocNodes=slurm-submit1 Default=YES MaxTime=INFINITE State=UP