diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..29f3bc2e623188acbb4fdb843076bd7a675c2c97
--- /dev/null
+++ b/roles/slurm-start/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+- name: start munge
+  service: name=munge state=started
+  sudo: true
+
+- name: start slurmdbd
+  service: name=slurmdbd state=started
+  sudo: true
+  ignore_errors: true
+
+- name: start slurm
+  service: name=slurm state=started
+  sudo: true
diff --git a/roles/slurmdb/handlers/main.yml b/roles/slurmdb/handlers/main.yml
index cbbaae73ee7bef6df63023906addb9f499ecd1f2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/roles/slurmdb/handlers/main.yml
+++ b/roles/slurmdb/handlers/main.yml
@@ -1,8 +0,0 @@
----
-  - name: restart slurmdbd
-    service: name={{ item }} state=restarted
-    with_items:
-      - slurmdbd
-      - slurm
-    sudo: true
-
diff --git a/roles/slurmdb/tasks/main.yml b/roles/slurmdb/tasks/main.yml
index f00f19cc6ceb3176603f3efff50fd7da98a9a183..14fbda28113a39d049684311656b7aa0fdca9790 100644
--- a/roles/slurmdb/tasks/main.yml
+++ b/roles/slurmdb/tasks/main.yml
@@ -13,12 +13,23 @@
   sudo: true
 
 - name: install mysql local root password 
-  mysql_user: check_implicit_admin=True login_user=root login_password="{{ sqlrootPasswd }}" name=root password="{{ sqlrootPasswd }}" state=present
+  mysql_user: check_implicit_admin=True login_user=root login_password={{ sqlrootPasswd }} name=root password={{ sqlrootPasswd }} state=present
   sudo: true
 
+- name: install slurmdbd init
+  template: src=slurmdbd.initd.j2 dest=/etc/init.d/slurmdbd mode=755
+  sudo: true
+
+- name: install slurmdb.conf init
+  template: src=slurmdbd.conf.j2 dest={{ slurm_dir }}/etc/slurmdbd.conf
+  sudo: true
+  when: slurm_dir is defined
+
+
 - name: install slurmdbd.conf
   template: src=slurmdbd.conf.j2 dest=/etc/slurm/slurmdbd.conf
   sudo: true
+  when: slurm_dir is not defined
 
 - name: configure database slurmdb localhost
   mysql_user: login_user=root login_password="{{ sqlrootPasswd }}" name=slurmdb password="{{ slurmdb_passwd }}" host=localhost priv=*.*:ALL,GRANT state=present
@@ -27,7 +38,6 @@
 - name: configure database slurmdb domain 
   mysql_user: login_user=root login_password="{{ sqlrootPasswd }}" name=slurmdb password="{{ slurmdb_passwd }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
   sudo: true
-#  notify: restart slurmdb
 
 - name: sanity check slrumdbd service
   service: "name=slurmdbd enabled=yes state=started"