more spagetti

roles/slurm-start/tasks/main.yml

@@ -101,14 +101,14 @@
   when: slurm_cluster_count.stdout == '1' and slurmctrl == inventory_hostname
 
 - name: start slurmd
-  service: name=slurmd state=start_slurmd enabled={{ slurmd_enabled }}
+  service: name=slurmd enabled={{ slurmd_enabled }}
   become: true
-  when: use_systemd is defined and start_slurmd is defined
+  when: use_systemd is defined and slurmd_enabled is defined
 
 - name: restart slurmd
   service: name=slurmd state=restarted enabled={{ slurmd_enabled }}
   become: true
-  when: use_systemd is defined and start_slurmd is defined and slurmd_service_installed.changed
+  when: use_systemd is defined and start_slurmd is defined and slurmd_service_installed.changed and start_slurmd
 
 - name: start slurm
   service: name=slurm state=restarted enabled={{ slurmd_enabled }}