pool/slurm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 928191 from home:eeich:branches:network:cluster

Browse Source 
- Utilize sysuser infrastructure to set user/group slurm.
  For munge authentication slurm should have a fixed UID across
  all nodes including the management server. Set it to 120
- Limit firewalld service definitions to SUSE versions >= 15.

OBS-URL: https://build.opensuse.org/request/show/928191
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=192
This commit is contained in:
Egbert Eich 2021-10-29 17:38:05 +00:00 committed by Git OBS Bridge
parent f4a3f06e75
commit c67f43163f
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slurm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Oct 29 15:54:53 UTC 2021 - Egbert Eich <eich@suse.com>
- Utilize sysuser infrastructure to set user/group slurm.
For munge authentication slurm should have a fixed UID across
all nodes including the management server. Set it to 120
- Limit firewalld service definitions to SUSE versions >= 15.
-------------------------------------------------------------------
Mon Oct 18 13:36:14 UTC 2021 - Christian Goll <cgoll@suse.com>

29
slurm.spec
View File

@ -1,5 +1,5 @@
#
# spec file
# spec file for package slurm
#
# Copyright (c) 2021 SUSE LLC
#
@ -53,6 +53,10 @@ ExclusiveArch: do_not_build
%define base_ver 2011
%endif
%if 0%{?suse_version} >= 1500
%define have_sysuser 1
%endif
%if 0%{?base_ver} > 0 && 0%{?base_ver} < %(echo %{_ver} | tr -d _)
%define upgrade 1
%endif
@ -99,6 +103,7 @@ ExclusiveArch: do_not_build
%define have_hdf5 1
%define have_boolean_deps 1
%define have_lz4 1
%define have_firewalld 1
%endif
%ifarch x86_64
@ -118,6 +123,9 @@ ExclusiveArch: do_not_build
%define slurm_u daemon
%define slurm_g root
%endif
%define slurm_uid 120
%define slurmdir %{_sysconfdir}/slurm
%define slurmdescr "SLURM workload manager"
%define libslurm libslurm%{so_version}
%{!?_rundir:%define _rundir /var/run}
@ -159,7 +167,7 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: coreutils
BuildRequires: fdupes
BuildRequires: firewalld
%{?have_firewalld:BuildRequires: firewalld}
BuildRequires: gcc-c++
BuildRequires: gtk2-devel
%if 0%{?have_hdf5}
@ -202,6 +210,7 @@ BuildRequires: libssh2-devel
BuildRequires: libyaml-devel
BuildRequires: rrdtool-devel
%if 0%{?with_systemd}
%{?have_sysuser:BuildRequires: sysuser-tools}
%{?systemd_ordering}
BuildRequires: dejagnu
BuildRequires: pkgconfig(systemd)
@ -613,9 +622,11 @@ install -D -m600 etc/slurmdbd.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/
install -D -m600 etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{pname}/slurmdbd.conf.example
install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat
install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather
%if 0%{?have_firewalld}
install -D -m644 %{S:10} %{buildroot}/%{_prefix}/lib/firewalld/services/slurmd.xml
install -D -m644 %{S:11} %{buildroot}/%{_prefix}/lib/firewalld/services/slurmctld.xml
install -D -m644 %{S:12} %{buildroot}/%{_prefix}/lib/firewalld/services/slurmdbd.xml
%endif
cat <<EOF >%{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf
include %{_sysconfdir}/%{pname}/plugstack.conf.d/*.conf
@ -660,6 +671,11 @@ sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmd.pid@" \
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" \
-e 's@After=\(.*\)@After=\1 mariadb.service@' \
%{buildroot}/%{_unitdir}/slurmdbd.service
%if 0%{?have_sysuser}
echo "u %slurm_u %{slurm_uid} \"%slurmdescr\" %{slurmdir}\n" > system-user-%{pname}.conf
%sysusers_generate_pre system-user-%{pname}.conf %{pname} system-user-%{pname}.conf
install -D -m 644 system-user-%{pname}.conf %{buildroot}%{_sysusersdir}/system-user-%{pname}.conf
%endif
%endif
# Delete static files:
@ -838,13 +854,13 @@ rm -f %{buildroot}/%{_libdir}/slurm/openapi_*
%insserv_cleanup
%endif
%pre config
%define slurmdir %{_sysconfdir}/slurm
%define slurmdescr "SLURM workload manager"
%pre config %{?have_sysuser:-f %{pname}.pre}
%if 0%{!?have_sysuser:1}
getent group %slurm_g >/dev/null || groupadd -r %slurm_g
getent passwd %slurm_u >/dev/null || useradd -r -g %slurm_g -d %slurmdir -s /bin/false -c %{slurmdescr} %slurm_u
[ -d %{_localstatedir}/spool/slurm ] && /bin/chown -h %slurm_u:%slurm_g %{_localstatedir}/spool/slurm
exit 0
%endif
%post config
%if 0%{?with_systemd}
@ -1238,9 +1254,12 @@ exit 0
%{?_rundir:%ghost %{_rundir}/slurm}
%dir %attr(0755, %slurm_u, %slurm_g)%{_localstatedir}/spool/slurm
%config(noreplace) %{_sysconfdir}/logrotate.d/slurm*
%if 0%{?have_firewalld}
%{_prefix}/lib/firewalld/services/slurmd.xml
%{_prefix}/lib/firewalld/services/slurmctld.xml
%{_prefix}/lib/firewalld/services/slurmdbd.xml
%endif
%{?have_sysuser:%{_sysusersdir}/system-user-%{pname}.conf}
%files config-man
%{?comp_at}