Skip to content

Add SSH support with pam_slurm_adopt #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add SSH support with pam_slurm_adopt #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions schedmd/slurm/25.05/rockylinux9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked <<EOR
set -xeuo pipefail
dnf -q -y install --setopt='install_weak_deps=False' \
gawk socat \
openssh-server \
./slurm-devel-[0-9]*.rpm \
./slurm-libpmi-[0-9]*.rpm \
./slurm-pam_slurm-[0-9]*.rpm \
Expand All @@ -196,17 +197,21 @@ mkdir -p /var/spool/slurmd/
cp -v /etc/nsswitch.conf{,.bak}
sed -i -E "s/^passwd:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
sed -i -E "s/^group:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
# Configure SSH
rm -f /etc/ssh/ssh_host_*
EOR

COPY files/etc/supervisord.conf /etc/
COPY \
files/etc/supervisord.d/slurmd.ini \
files/etc/supervisord.d/sshd.ini \
files/etc/supervisord.d/fakesystemd.ini \
/etc/supervisord.d/
COPY files/usr/local/bin/fakesystemd.sh /usr/local/bin/
COPY files/usr/local/bin/slurmd-entrypoint.sh /usr/local/bin/entrypoint.sh

EXPOSE 6818/tcp
EXPOSE 22/tcp
ENTRYPOINT ["entrypoint.sh"]

################################################################################
Expand Down
14 changes: 14 additions & 0 deletions schedmd/slurm/25.05/rockylinux9/files/usr/local/bin/slurmd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set -euo pipefail

# Additional arguments to pass to slurmd.
export SLURMD_OPTIONS="${SLURMD_OPTIONS:-} $*"
export SSHD_OPTIONS="${SSHD_OPTIONS:-""}"

# The asserted CPU resource limit of the pod.
export POD_CPUS="${POD_CPUS:-0}"
Expand Down Expand Up @@ -94,9 +95,22 @@ function addConfItem() {
export SLURMD_OPTIONS="${slurmdOptions[*]}"
}

# Configure PAM for pam_slurm_adopt (following login's dynamic pattern)
function configure_pam() {
# Add pam_slurm_adopt to SSH PAM configuration if not already present
if ! grep -q "pam_slurm_adopt.so" /etc/pam.d/sshd 2>/dev/null; then
# Insert after common-account include
sed -i '/^account[[:space:]]*include[[:space:]]*password-auth/a -account required pam_slurm_adopt.so action_no_jobs=deny action_unknown=newest action_adopt_failure=deny action_generic_failure=deny disable_x11=0' /etc/pam.d/sshd
fi
}

function main() {
mkdir -p /run/slurm/
mkdir -p /var/spool/slurmd/
mkdir -p /run/sshd/
chmod 0755 /run/sshd/
ssh-keygen -A
configure_pam

local coreSpecCount=0
if ((POD_CPUS > 0)); then
Expand Down
5 changes: 5 additions & 0 deletions schedmd/slurm/25.05/ubuntu24.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ set -xeuo pipefail
apt-get -qq update
apt-get -qq -y install --no-install-recommends --fix-broken \
gawk socat \
openssh-server \
./slurm-smd-client_[0-9]*.deb \
./slurm-smd-client-dbgsym_[0-9]*.ddeb \
./slurm-smd-dev_[0-9]*.deb \
Expand All @@ -200,17 +201,21 @@ mkdir -p /var/spool/slurmd/
cp -v /etc/nsswitch.conf{,.bak}
sed -i -E "s/^passwd:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
sed -i -E "s/^group:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
# Configure SSH
rm -f /etc/ssh/ssh_host_*
EOR

COPY files/etc/supervisor/supervisord.conf /etc/supervisor/
COPY \
files/etc/supervisor/conf.d/slurmd.conf \
files/etc/supervisor/conf.d/sshd.conf \
files/etc/supervisor/conf.d/fakesystemd.conf \
/etc/supervisor/conf.d/
COPY files/usr/local/bin/fakesystemd.sh /usr/local/bin/
COPY files/usr/local/bin/slurmd-entrypoint.sh /usr/local/bin/entrypoint.sh

EXPOSE 6818/tcp
EXPOSE 22/tcp
ENTRYPOINT ["entrypoint.sh"]

################################################################################
Expand Down
14 changes: 14 additions & 0 deletions schedmd/slurm/25.05/ubuntu24.04/files/usr/local/bin/slurmd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set -euo pipefail

# Additional arguments to pass to slurmd.
export SLURMD_OPTIONS="${SLURMD_OPTIONS:-} $*"
export SSHD_OPTIONS="${SSHD_OPTIONS:-""}"

# The asserted CPU resource limit of the pod.
export POD_CPUS="${POD_CPUS:-0}"
Expand Down Expand Up @@ -94,9 +95,22 @@ function addConfItem() {
export SLURMD_OPTIONS="${slurmdOptions[*]}"
}

# Configure PAM for pam_slurm_adopt (following login's dynamic pattern)
function configure_pam() {
# Add pam_slurm_adopt to SSH PAM configuration if not already present
if ! grep -q "pam_slurm_adopt.so" /etc/pam.d/sshd 2>/dev/null; then
# Insert after common-account include
sed -i '/^@include common-account/a -account required pam_slurm_adopt.so action_no_jobs=deny action_unknown=newest action_adopt_failure=deny action_generic_failure=deny disable_x11=0' /etc/pam.d/sshd
fi
}

function main() {
mkdir -p /run/slurm/
mkdir -p /var/spool/slurmd/
mkdir -p /run/sshd/
chmod 0755 /run/sshd/
ssh-keygen -A
configure_pam

local coreSpecCount=0
if ((POD_CPUS > 0)); then
Expand Down
5 changes: 5 additions & 0 deletions schedmd/slurm/master/rockylinux9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked <<EOR
set -xeuo pipefail
dnf -q -y install --setopt='install_weak_deps=False' \
gawk socat \
openssh-server \
./slurm-devel-[0-9]*.rpm \
./slurm-libpmi-[0-9]*.rpm \
./slurm-pam_slurm-[0-9]*.rpm \
Expand All @@ -193,17 +194,21 @@ mkdir -p /var/spool/slurmd/
cp -v /etc/nsswitch.conf{,.bak}
sed -i -E "s/^passwd:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
sed -i -E "s/^group:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
# Configure SSH
rm -f /etc/ssh/ssh_host_*
EOR

COPY files/etc/supervisord.conf /etc/
COPY \
files/etc/supervisord.d/slurmd.ini \
files/etc/supervisord.d/sshd.ini \
files/etc/supervisord.d/fakesystemd.ini \
/etc/supervisord.d/
COPY files/usr/local/bin/fakesystemd.sh /usr/local/bin/
COPY files/usr/local/bin/slurmd-entrypoint.sh /usr/local/bin/entrypoint.sh

EXPOSE 6818/tcp
EXPOSE 22/tcp
ENTRYPOINT ["entrypoint.sh"]

################################################################################
Expand Down
14 changes: 14 additions & 0 deletions schedmd/slurm/master/rockylinux9/files/usr/local/bin/slurmd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set -euo pipefail

# Additional arguments to pass to slurmd.
export SLURMD_OPTIONS="${SLURMD_OPTIONS:-} $*"
export SSHD_OPTIONS="${SSHD_OPTIONS:-""}"

# The asserted CPU resource limit of the pod.
export POD_CPUS="${POD_CPUS:-0}"
Expand Down Expand Up @@ -94,9 +95,22 @@ function addConfItem() {
export SLURMD_OPTIONS="${slurmdOptions[*]}"
}

# Configure PAM for pam_slurm_adopt (following login's dynamic pattern)
function configure_pam() {
# Add pam_slurm_adopt to SSH PAM configuration if not already present
if ! grep -q "pam_slurm_adopt.so" /etc/pam.d/sshd 2>/dev/null; then
# Insert after common-account include
sed -i '/^account[[:space:]]*include[[:space:]]*password-auth/a -account required pam_slurm_adopt.so action_no_jobs=deny action_unknown=newest action_adopt_failure=deny action_generic_failure=deny disable_x11=0' /etc/pam.d/sshd
fi
}

function main() {
mkdir -p /run/slurm/
mkdir -p /var/spool/slurmd/
mkdir -p /run/sshd/
chmod 0755 /run/sshd/
ssh-keygen -A
configure_pam

local coreSpecCount=0
if ((POD_CPUS > 0)); then
Expand Down
5 changes: 5 additions & 0 deletions schedmd/slurm/master/ubuntu24.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ set -xeuo pipefail
apt-get -qq update
apt-get -qq -y install --no-install-recommends --fix-broken \
gawk socat \
openssh-server \
./slurm-smd-client_[0-9]*.deb \
./slurm-smd-dev_[0-9]*.deb \
./slurm-smd-doc_[0-9]*.deb \
Expand All @@ -190,17 +191,21 @@ mkdir -p /var/spool/slurmd/
cp -v /etc/nsswitch.conf{,.bak}
sed -i -E "s/^passwd:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
sed -i -E "s/^group:[[:space:]]+/&slurm /g" /etc/nsswitch.conf
# Configure SSH
rm -f /etc/ssh/ssh_host_*
EOR

COPY files/etc/supervisor/supervisord.conf /etc/supervisor/
COPY \
files/etc/supervisor/conf.d/slurmd.conf \
files/etc/supervisor/conf.d/sshd.conf \
files/etc/supervisor/conf.d/fakesystemd.conf \
/etc/supervisor/conf.d/
COPY files/usr/local/bin/fakesystemd.sh /usr/local/bin/
COPY files/usr/local/bin/slurmd-entrypoint.sh /usr/local/bin/entrypoint.sh

EXPOSE 6818/tcp
EXPOSE 22/tcp
ENTRYPOINT ["entrypoint.sh"]

################################################################################
Expand Down
14 changes: 14 additions & 0 deletions schedmd/slurm/master/ubuntu24.04/files/usr/local/bin/slurmd-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set -euo pipefail

# Additional arguments to pass to slurmd.
export SLURMD_OPTIONS="${SLURMD_OPTIONS:-} $*"
export SSHD_OPTIONS="${SSHD_OPTIONS:-""}"

# The asserted CPU resource limit of the pod.
export POD_CPUS="${POD_CPUS:-0}"
Expand Down Expand Up @@ -94,9 +95,22 @@ function addConfItem() {
export SLURMD_OPTIONS="${slurmdOptions[*]}"
}

# Configure PAM for pam_slurm_adopt (following login's dynamic pattern)
function configure_pam() {
# Add pam_slurm_adopt to SSH PAM configuration if not already present
if ! grep -q "pam_slurm_adopt.so" /etc/pam.d/sshd 2>/dev/null; then
# Insert after common-account include
sed -i '/^@include common-account/a -account required pam_slurm_adopt.so action_no_jobs=deny action_unknown=newest action_adopt_failure=deny action_generic_failure=deny disable_x11=0' /etc/pam.d/sshd
fi
}

function main() {
mkdir -p /run/slurm/
mkdir -p /var/spool/slurmd/
mkdir -p /run/sshd/
chmod 0755 /run/sshd/
ssh-keygen -A
configure_pam

local coreSpecCount=0
if ((POD_CPUS > 0)); then
Expand Down