mueller/cobald-testenv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Thorsten Müller
2021-04-29 12:19:33 +02:00
parent bc27dec00e
commit 38a5b89de9
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/slurm/files/entrypoint.sh
View File

@@ -1,8 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
if [ -f "/etc/munge/munge.key" ] ; then
chown munge:munge /etc/munge/munge.key chown munge:munge /etc/munge/munge.key
chmod 600 /etc/munge/munge.key chmod 600 /etc/munge/munge.key
fi
exec "$@" exec "$@"

15
roles/slurm/files/slurm.Dockerfile
View File

@@ -2,25 +2,28 @@ FROM docker.io/library/centos:7 as base
RUN yum install -y epel-release && \ RUN yum install -y epel-release && \
yum install -y slurm && \ 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 && \ 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 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" ] ENTRYPOINT [ "/usr/local/sbin/entrypoint.sh" ]
FROM base as slurmd FROM base as slurmd
RUN yum install -y slurm-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 FROM base as slurmctld
RUN yum install -y slurm-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 & })'

15
roles/slurm/files/slurmctld.Dockerfile
View File

@@ -1,20 +1,19 @@
FROM docker.io/library/centos:7 as base FROM docker.io/library/centos:7 as base
RUN yum install -y epel-release && \ RUN yum install -y epel-release && \
yum install -y slurm slurm-slurmctld && \ 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 && \ RUN yum install -y less iproute bind-utils nmap-ncat net-tools && \
yum clean all yum clean all && rm -rf /var/cache/yum
RUN yum install -y slurm-slurmctld && \
yum clean all
COPY entrypoint.sh /usr/local/sbin/entrypoint.sh 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" ] 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 & })' # ... & tail --retry --pid $! -f /var/log/condor/MasterLog & })'

12
roles/slurm/files/slurmd.Dockerfile
View File

@@ -1,17 +1,21 @@
FROM docker.io/library/centos:7 FROM docker.io/library/centos:7
RUN yum install -y epel-release && \ RUN yum install -y epel-release && \
yum install -y slurm slurm-slurmd && \ 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 && \ 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 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" ] 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 <({ 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 & })' CMD bash -c 'cat <({ su -s /bin/sh -c "munged -F" munge & slurmd -D & })'

2
roles/slurm/templates/slurm.conf.j2
View File

@@ -163,4 +163,4 @@ SlurmdDebug=verbose
# COMPUTE NODES # COMPUTE NODES
NodeName=slurm-exec[1-{{num_nodes}}] CPUs=2 CoresPerSocket=2 State=UNKNOWN NodeName=slurm-exec[1-{{num_nodes}}] CPUs=2 CoresPerSocket=2 State=UNKNOWN
NodeName=slurm-submit1 CPUs=1 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