Accepting request 553521 from home:mslacken:hpc

- added /var/spool/ directory and removed duplicated entries from slurm.conf

OBS-URL: https://build.opensuse.org/request/show/553521
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=36
This commit is contained in:
Egbert Eich 2017-12-07 11:18:20 +00:00 committed by Git OBS Bridge
parent 2bb9a2359c
commit 6579dd2427
2 changed files with 15 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 1 16:04:55 UTC 2017 - cgoll@suse.com
- added /var/spool/ directory and removed duplicated entries from slurm.conf
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com Fri Nov 10 13:52:30 UTC 2017 - eich@suse.com

View File

@ -331,6 +331,7 @@ install -D -m755 etc/init.d.slurmdbd %{buildroot}%{_initrddir}/slurmdbd
ln -sf %{_initrddir}/slurm %{buildroot}%{_sbindir}/rcslurm ln -sf %{_initrddir}/slurm %{buildroot}%{_sbindir}/rcslurm
ln -sf %{_initrddir}/slurmdbd %{buildroot}%{_sbindir}/rcslurmdbd ln -sf %{_initrddir}/slurmdbd %{buildroot}%{_sbindir}/rcslurmdbd
%endif %endif
mkdir -p %{buildroot}%{_var}/spool/slurm
rm -f contribs/cray/opt_modulefiles_slurm rm -f contribs/cray/opt_modulefiles_slurm
rm -f %{buildroot}%{_sysconfdir}/plugstack.conf.template rm -f %{buildroot}%{_sysconfdir}/plugstack.conf.template
@ -360,15 +361,14 @@ head -n -2 %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf.example | grep -v Retu
sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
echo "# OpenHPC default configuration" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdSpoolDir=\)/.*#\1%{_localstatedir}/spool/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
echo "PropagateResourceLimitsExcept=MEMLOCK" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf cat >>%{buildroot}/%{_sysconfdir}/%{name}/slurm.conf <<EOF
echo "SlurmdLogFile=/var/log/slurm.log" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf # SUSE default configuration
echo "SlurmctldLogFile=/var/log/slurmctld.log" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf PropagateResourceLimitsExcept=MEMLOCK
echo "Epilog=/etc/slurm/slurm.epilog.clean" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf Epilog=/etc/slurm/slurm.epilog.clean
echo "NodeName=c[1-4] Sockets=2 CoresPerSocket=8 ThreadsPerCore=2 State=UNKNOWN" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf NodeName=linux State=UNKNOWN
echo "PartitionName=normal Nodes=c[1-4] Default=YES MaxTime=24:00:00 State=UP" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf PartitionName=normal Nodes=linux Default=YES MaxTime=24:00:00 State=UP
# 6/3/16 nirmalasrjn@gmail.com - Adding ReturnToService Directive to starting config file (note removal of variable during above creation) EOF
echo "ReturnToService=1" >> %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
# 9/17/14 karl.w.schulz@intel.com - Add option to drop VM cache during epilog # 9/17/14 karl.w.schulz@intel.com - Add option to drop VM cache during epilog
sed -i '/^# No other SLURM jobs,/i \\n# Drop clean caches (OpenHPC)\necho 3 > /proc/sys/vm/drop_caches\n\n#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.epilog.clean sed -i '/^# No other SLURM jobs,/i \\n# Drop clean caches (OpenHPC)\necho 3 > /proc/sys/vm/drop_caches\n\n#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.epilog.clean
mkdir -p %{buildroot}/%_localstatedir/lib/slurm mkdir -p %{buildroot}/%_localstatedir/lib/slurm
@ -589,6 +589,7 @@ exit 0
%endif %endif
%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm} %{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm}
%{?with_systemd:%{_tmpfilesdir}/%{name}.conf} %{?with_systemd:%{_tmpfilesdir}/%{name}.conf}
%dir %{_var}/spool/slurm
%files openlava %files openlava
%defattr(-,root,root) %defattr(-,root,root)