From 08c7233b38caee7c226382cb6f6071d0237d24c245a04449d514126ff814ec62 Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Wed, 6 Jan 2021 10:42:08 +0000 Subject: [PATCH] Accepting request 860690 from home:anag:branches:network:cluster - Add support for configuration files from external plugins. While built-in plugins have their configuration added in slurm.conf, external SPANK plugins add their configuration to plugstack.conf To allow packaging easily spank plugins, their configuration files should be added independently at /etc/spack/plugstack.conf.d and plugstack.conf should be left with an oneliner including all the files under /etc/spack/plugstack.conf.d OBS-URL: https://build.opensuse.org/request/show/860690 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=164 --- slurm.changes | 11 +++++++++++ slurm.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/slurm.changes b/slurm.changes index 2b09e00..76c469b 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 5 08:02:02 UTC 2021 - Ana Guerrero Lopez + +- Add support for configuration files from external plugins. + While built-in plugins have their configuration added in slurm.conf, + external SPANK plugins add their configuration to plugstack.conf + To allow packaging easily spank plugins, their configuration files + should be added independently at /etc/spack/plugstack.conf.d and + plugstack.conf should be left with an oneliner including all the + files under /etc/spack/plugstack.conf.d + ------------------------------------------------------------------- Mon Dec 28 14:37:58 UTC 2020 - Ana Guerrero Lopez diff --git a/slurm.spec b/slurm.spec index 0b1f2af..14cb779 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,7 +1,7 @@ # # spec file for package slurm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -607,6 +607,12 @@ install -D -m600 etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{pname}/s install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather +cat <%{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf +include %{_sysconfdir}/%{pname}/plugstack.conf.d/*.conf +EOF + +mkdir -p %{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf.d + cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt cp contribs/pam/README ../README.pam_slurm # change slurm.conf for our needs @@ -1043,6 +1049,8 @@ exit 0 %files plugins %{?comp_at} %config %{_sysconfdir}/ld.so.conf.d/slurm.conf +%config(noreplace) %{_sysconfdir}/%{pname}/plugstack.conf +%dir %{_sysconfdir}/%{pname}/plugstack.conf.d %dir %{_libdir}/slurm %{_libdir}/slurm/libslurmfull.so %{_libdir}/slurm/accounting_storage_none.so