forked from pool/slurm
Accepting request 570889 from home:mslacken
- moved config files to slurm-config package
- Moved slurmstepd and man page into slurm-node due to slurmd dependency
- Moved config files into slurm-node
- Moved slurmd rc scripts into slurm-node
- Made slurm-munge require slurm-plugins instead of slurm itself
- slurm-node suggested slurm-munge, causing the whole slurm to be
installed. The slurm-plugins seems to be a more base class
- split up light wight slurm-node package for deployment on nodes
OBS-URL: https://build.opensuse.org/request/show/570889
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=38
This commit is contained in:
Git OBS Bridge
parent
6579dd2427
commit
9127e7f808
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 29 13:43:57 UTC 2018 - cgoll@suse.com
|
||||
|
||||
- moved config files to slurm-config package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 29 04:01:28 UTC 2018 - jjolly@suse.com
|
||||
|
||||
- Moved slurmstepd and man page into slurm-node due to slurmd dependency
|
||||
- Moved config files into slurm-node
|
||||
- Moved slurmd rc scripts into slurm-node
|
||||
- Made slurm-munge require slurm-plugins instead of slurm itself
|
||||
- slurm-node suggested slurm-munge, causing the whole slurm to be
|
||||
installed. The slurm-plugins seems to be a more base class
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 17 14:21:49 UTC 2018 - cgoll@suse.com
|
||||
|
||||
- split up light wight slurm-node package for deployment on nodes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 1 16:04:55 UTC 2017 - cgoll@suse.com
|
||||
|
||||
|
||||
135
slurm.spec
135
slurm.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package slurm
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -69,7 +69,8 @@ Patch2: slurmd-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch3: plugins-cgroup-Fix-slurmd-for-new-API-in-hwloc-2.0.patch
|
||||
Patch4: pam_slurm-Initialize-arrays-and-pass-sizes.patch
|
||||
Patch5: slurmctld-service-var-run-path.patch
|
||||
Requires: slurm-plugins = %{version}
|
||||
Requires: slurm-config = %{version}
|
||||
Requires: slurm-node = %{version}
|
||||
%if 0%{?suse_version} <= 1140
|
||||
Requires(pre): pwdutils
|
||||
%else
|
||||
@ -107,7 +108,6 @@ BuildRequires: systemd
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Recommends: %{name}-munge
|
||||
Obsoletes: slurm-sched-wiki < %{version}
|
||||
Obsoletes: slurmdb-direct < %{version}
|
||||
|
||||
@ -181,7 +181,7 @@ This package cobtains the SLURM NULL authentication module.
|
||||
Summary: SLURM authentication and crypto implementation using Munge
|
||||
Group: Productivity/Clustering/Computing
|
||||
Requires: munge
|
||||
Requires: slurm = %{version}
|
||||
Requires: slurm-plugins = %{version}
|
||||
BuildRequires: munge-devel
|
||||
Obsoletes: slurm-auth-munge < %{version}
|
||||
Provides: slurm-auth-munge = %{version}
|
||||
@ -292,6 +292,25 @@ BuildRequires: lua-devel
|
||||
This package includes the Lua API to provide an interface to SLURM
|
||||
through Lua.
|
||||
|
||||
%package node
|
||||
Summary: Minimal slurm node
|
||||
Group: Productivity/Clustering/Computing
|
||||
Requires: slurm-config = %{version}
|
||||
Requires: slurm-plugins = %{version}
|
||||
Recommends: %{name}-munge
|
||||
|
||||
%description node
|
||||
This package contains just the minmal code to run a compute node.
|
||||
|
||||
%package config
|
||||
Summary: Config files and directories for slurm services
|
||||
Group: Productivity/Clustering/Computing
|
||||
|
||||
%description config
|
||||
This package contains the slurm config files necessary direcories
|
||||
for the slurm daemons.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{ver}
|
||||
%patch0 -p1
|
||||
@ -431,23 +450,11 @@ EOF
|
||||
|
||||
%pre
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_pre slurmd.service
|
||||
%service_add_pre slurmctld.service
|
||||
%endif
|
||||
%define slurmdir %{_sysconfdir}/slurm
|
||||
%define slurmdescr "SLURM workload manager"
|
||||
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
|
||||
exit 0
|
||||
|
||||
%post
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?sle_version} >= 120200
|
||||
%tmpfiles_create slurm.conf
|
||||
%else
|
||||
systemd-tmpfiles --create slurm.conf
|
||||
%endif
|
||||
%service_add_post slurmd.service
|
||||
%service_add_post slurmctld.service
|
||||
%else
|
||||
%fillup_and_insserv slurm
|
||||
@ -455,18 +462,13 @@ exit 0
|
||||
|
||||
%preun
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_preun slurmd.service
|
||||
%service_del_preun slurmctld.service
|
||||
%else
|
||||
%stop_on_removal slurmd
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_postun slurmd.service
|
||||
%service_del_postun slurmctld.service
|
||||
%else
|
||||
%restart_on_update slurmd
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
@ -497,6 +499,47 @@ exit 0
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
%pre node
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_pre slurmd.service
|
||||
%endif
|
||||
|
||||
%post node
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_post slurmd.service
|
||||
%endif
|
||||
|
||||
%preun node
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_preun slurmd.service
|
||||
%else
|
||||
%stop_on_removal slurmd
|
||||
%endif
|
||||
|
||||
%postun node
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_postun slurmd.service
|
||||
%else
|
||||
%restart_on_update slurmd
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
%pre config
|
||||
%define slurmdir %{_sysconfdir}/slurm
|
||||
%define slurmdescr "SLURM workload manager"
|
||||
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
|
||||
exit 0
|
||||
|
||||
%post config
|
||||
%if 0%{?with_systemd}
|
||||
%if 0%{?sle_version} >= 120200
|
||||
%tmpfiles_create slurm.conf
|
||||
%else
|
||||
systemd-tmpfiles --create slurm.conf
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%post -n %{libslurm} -p /sbin/ldconfig
|
||||
%postun -n %{libslurm} -p /sbin/ldconfig
|
||||
|
||||
@ -529,8 +572,6 @@ exit 0
|
||||
%{_bindir}/strigger
|
||||
%{?have_netloc:%{_bindir}/netloc_to_topology}
|
||||
%{_sbindir}/slurmctld
|
||||
%{_sbindir}/slurmd
|
||||
%{_sbindir}/slurmstepd
|
||||
%{_mandir}/man1/sacct.1*
|
||||
%{_mandir}/man1/sacctmgr.1*
|
||||
%{_mandir}/man1/salloc.1*
|
||||
@ -564,32 +605,12 @@ exit 0
|
||||
%{_mandir}/man5/topology.*
|
||||
%{_mandir}/man5/knl.conf.5.*
|
||||
%{_mandir}/man8/slurmctld.*
|
||||
%{_mandir}/man8/slurmd.*
|
||||
%{_mandir}/man8/slurmstepd*
|
||||
%{_mandir}/man8/spank*
|
||||
%dir %{_libdir}/slurm/src
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_sysconfdir}/%{name}/layouts.d
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/slurm.conf
|
||||
%{?OHPC_BUILD:%config %{_sysconfdir}/%{name}/slurm.conf.example}
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/cgroup_allowed_devices_file.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/slurm.epilog.clean
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power_cpufreq.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/unit.conf.example
|
||||
%if 0%{?with_systemd}
|
||||
%{_unitdir}/slurmd.service
|
||||
%{_unitdir}/slurmctld.service
|
||||
%{_sbindir}/rcslurmd
|
||||
%{_sbindir}/rcslurmctld
|
||||
%else
|
||||
%{_initrddir}/slurm
|
||||
%{_sbindir}/rcslurm
|
||||
%endif
|
||||
%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm}
|
||||
%{?with_systemd:%{_tmpfilesdir}/%{name}.conf}
|
||||
%dir %{_var}/spool/slurm
|
||||
|
||||
%files openlava
|
||||
%defattr(-,root,root)
|
||||
@ -800,4 +821,32 @@ exit 0
|
||||
/%_lib/security/pam_slurm.so
|
||||
/%_lib/security/pam_slurm_adopt.so
|
||||
|
||||
%files node
|
||||
%{_sbindir}/slurmd
|
||||
%{_sbindir}/slurmstepd
|
||||
%{_mandir}/man8/slurmd.*
|
||||
%{_mandir}/man8/slurmstepd*
|
||||
%if 0%{?with_systemd}
|
||||
%{_sbindir}/rcslurmd
|
||||
%{_unitdir}/slurmd.service
|
||||
%else
|
||||
%{_initrddir}/slurm
|
||||
%{_sbindir}/rcslurm
|
||||
%endif
|
||||
|
||||
%files config
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_sysconfdir}/%{name}/layouts.d
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/slurm.conf
|
||||
%{?OHPC_BUILD:%config %{_sysconfdir}/%{name}/slurm.conf.example}
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/cgroup_allowed_devices_file.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/slurm.epilog.clean
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/power_cpufreq.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/layouts.d/unit.conf.example
|
||||
%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm}
|
||||
%{?with_systemd:%{_tmpfilesdir}/%{name}.conf}
|
||||
%dir %{_var}/spool/slurm
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user