diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index bbbc5fa335baa18e959ec43de5a71bdecd6909a7..50c8ea943d16b341cac35193d79ada45fd8d3186 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -56,6 +56,16 @@
   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
+
+- name: "create cluster in slurm db"
+  shell:  "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
+  become: true
+  when: '"1" = slurm_cluster_count.stdout'
+
 - name: make sure munge is started 
   service: name=munge state=started enabled=yes
   become: true
@@ -71,11 +81,6 @@
   become: true
   when: start_slurmdbd is defined and slurmdbd_service_installed.changed
 
-#- name: "create cluster in slurm db"
-#  shell:  "{{slurm_dir}}/bin/sacctmgr -i create cluster {{ clustername }}"
-#  become: true
-#  ignore_errors: true
-
 - name: start slurmctl
   service: name=slurmctld state=started enabled={{ start_slurmctld }}
   become: true