From 61a763d188783056306855c6a30a6d885c069abf Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Fri, 24 Apr 2020 01:58:27 +0000
Subject: [PATCH] reordering slurm initiation
---
roles/slurm-start/tasks/main.yml | 35 ++++++++++++++++++--------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index 678de3d5..33d9ca16 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -56,20 +56,6 @@
become: true
when: use_systemd is defined and start_slurmdbd is defined and slurmdbd_service_installed.changed
-- name: "count clusters in slurm db"
- shell: "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
- register: slurm_cluster_count
- check_mode: no
- changed_when: false
-
-- debug:
- var: slurm_cluster_count
-
-- name: "create cluster in slurm db"
- shell: "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
- become: true
- when: slurm_cluster_count.stdout == '1'
-
- name: make sure munge is started
service: name=munge state=started enabled=yes
become: true
@@ -80,7 +66,12 @@
become: true
when: use_systemd is defined and ( slurmdbd_service_installed.changed or slurmctld_service_installed.changed or slurmd_service_installed.changed)
-- name: start slurmdbd
+- name: start slurmdbd
+ service: name=slurmdbd state=started enabled={{ start_slurmdbd }}
+ become: true
+ when: start_slurmdbd is defined
+
+- name: restart slurmdbd
service: name=slurmdbd state=restarted enabled={{ start_slurmdbd }}
become: true
when: start_slurmdbd is defined and slurmdbd_service_installed.changed
@@ -95,6 +86,20 @@
become: true
when: use_systemd is defined and start_slurmctld is defined and slurmctld_service_installed.changed
+- name: "count clusters in slurm db"
+ shell: "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
+ register: slurm_cluster_count
+ check_mode: no
+ changed_when: false
+
+- debug:
+ var: slurm_cluster_count
+
+- name: "create cluster in slurm db" #needs munge to run
+ shell: "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
+ become: true
+ when: slurm_cluster_count.stdout == '1'
+
- name: start slurmd
service: name=slurmd state=started enabled={{ slurmd_enabled }}
become: true
--
GitLab