From a3104b029f02c161cc983f0f30551e8d516d3377 Mon Sep 17 00:00:00 2001
From: Helena Rasche <hxr@hx42.org>
Date: Tue, 12 Jan 2021 16:10:50 +0100
Subject: [PATCH] =?UTF-8?q?handle=20ubuntus=20new=20location!=20?=
 =?UTF-8?q?=F0=9F=A4=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 defaults/main.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 6d98ea3..0c74210 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -36,7 +36,9 @@ __slurm_config_default:
   SlurmctldLogFile: "{{ '/var/log/slurm-llnl/slurmctld.log' if __slurm_debian else omit }}"
   SlurmctldPidFile: >-
     {{
-        '/var/run/slurm-llnl/slurmctld.pid' if __slurm_debian else omit
+        '/run/slurmctld.pid' if __slurm_debian and ansible_distribution_release == 'focal' else (
+        '/var/run/slurm-llnl/slurmctld.pid' if __slurm_debian else
+        omit)
     }}
   StateSaveLocation: >-
     {{
@@ -49,7 +51,9 @@ __slurm_config_default:
   SlurmdLogFile: "{{ '/var/log/slurm-llnl/slurmd.log' if __slurm_debian else omit }}"
   SlurmdPidFile: >-
     {{
-        '/var/run/slurm-llnl/slurmd.pid' if __slurm_debian else omit
+        '/run/slurmd.pid' if __slurm_debian and ansible_distribution_release == 'focal' else (
+        '/var/run/slurm-llnl/slurmd.pid' if __slurm_debian else
+        omit)
     }}
   SlurmdSpoolDir: >-
     {{