From e3e7bce7dc5c61fe5161b6c29e97ce40f55ee74c150dd2e6a2c62aa41c76973c Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 14 Sep 2019 21:47:11 +0000 Subject: [PATCH] Accepting request 731004 from home:eeich:branches:network:cluster - Edit sample configuration to deprecate "ControlMachine", "ControlAddr", "BackupController" and "BackupAddr" in favor "SlurmctldHost". OBS-URL: https://build.opensuse.org/request/show/731004 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=112 --- slurm.changes | 7 +++++++ slurm.spec | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/slurm.changes b/slurm.changes index d11ed76..003ecfa 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 11 10:55:25 UTC 2019 - Egbert Eich + +- Edit sample configuration to deprecate "ControlMachine", + "ControlAddr", "BackupController" and "BackupAddr" in favor + "SlurmctldHost". + ------------------------------------------------------------------- Sat Aug 17 14:20:35 UTC 2019 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 31d332d..a085268 100644 --- a/slurm.spec +++ b/slurm.spec @@ -541,6 +541,11 @@ sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/% sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf sed -i 's#^\(SlurmdSpoolDir=\)/.*#\1%{_localstatedir}/spool/slurm#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf +sed -i -e '/^ControlMachine=/i# Ordered List of Control Nodes' \ + -e 's#ControlMachine=\(.*\)$#SlurmctldHost=\1(10.0.10.20)#' \ + -e 's#BackupController=.*#SlurmctldHost=linux1(10.0.10.21)#' \ + -e '/.*ControlAddr=.*/d' \ + -e '/.*BackupAddr=.*/d' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf cat >>%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf <