diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index a857be9a01b37ba0b4d56ccd8079ca731abe71f5..2b163fcafde6ca3bf7d5702510157e8c419f442c 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -5,6 +5,11 @@
   when: (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") and
           ( ansible_distribution_major_version == "7") 
 
+- name: set slurmd_enabled (default enabled)
+  set_fact:
+    slurmd_enabled: True
+  when: slurmd_enabled is not defined
+
 - name: install slurmdbd init
   template: src=slurmdbd.initd.j2 dest=/etc/init.d/slurmdbd mode=755
   sudo: true
@@ -56,11 +61,11 @@
   when: use_systemd is defined and start_slurmctld is defined
 
 - name: start slurmd
-  service: name=slurmd state=started enabled=yes
+  service: name=slurmd state=started enabled={{ slurmd_enabled }}
   sudo: true
   when: use_systemd is defined and start_slurmd is defined
 
 - name: start slurm
-  service: name=slurm state=started enabled=yes
+  service: name=slurm state=started enabled={{ slurmd_enabled }}
   sudo: true
   when: use_systemd is not defined and ( start_slurmd is defined or start_slurmctld is defined )