diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index 4b3db43f612dc0657e144c16fbb16d15fb5d882d..56a828780cb54c06c230f04c718cb7c1805d948d 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/roles/slurm-build/tasks/main.yml
@@ -11,6 +11,7 @@
     - pam-devel
     - perl-ExtUtils-MakeMaker
     - bzip2-devel
+    - mysql
 
 - name: install deps in control node
   yum: name={{ item }} state=installed
diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml
index 7bf688a8a430b8da97f6d83b75ab29ffee28cf2b..1f9e2d663901649769ae7efb1d0c0d9fba484e59 100644
--- a/roles/slurm/defaults/main.yml
+++ b/roles/slurm/defaults/main.yml
@@ -1,8 +1,5 @@
 ---
 clustername: "CIAB" 
-#slurmctlddebug: 3
-#slurmddebug: 3
-#slurmdlogfile: /tmp/slurm/log/slurmd.log 
-#slurmctldlogfile: /tmp/slurm/log/slurmctld.log 
-#slurmschedlog: 9
-#slurmschedlogfile: /tmp/slurm/log/slurmsched.log
+slurmctlddebug: {} 
+slurmddebug: {} 
+slurmschedlog: {} 
diff --git a/roles/slurm/templates/slurm.conf.j2 b/roles/slurm/templates/slurm.conf.j2
index 8c4def4c6db5c851ea4b9c6b8b7d1de469b57ac0..202480a58d9e95975a7dd397bfb992daadd4807d 100644
--- a/roles/slurm/templates/slurm.conf.j2
+++ b/roles/slurm/templates/slurm.conf.j2
@@ -74,23 +74,23 @@ FastSchedule=1
 #PriorityMaxAge=1-0
 #
 # LOGGING
-{% if slurmctlddebug and slurmctldlogfile %}
-SlurmctldDebug={{ slurmctlddebug }}
-SlurmctldLogFile={{ slurmctldlogfile }}
+{% if slurmctlddebug %}
+SlurmctldDebug={{ slurmctlddebug.level }}
+SlurmctldLogFile={{ slurmctlddebug.log }}
 {% else %}
 #SlurmctldDebug=
 #SlurmctldLogFile=
 {% endif %}
-{% if slurmddebug and slurmdlogfile %}
-SlurmdDebug={{ slurmddebug }}
-SlurmdLogFile={{ slurmdlogfile }}
+{% if slurmddebug %}
+SlurmdDebug={{ slurmddebug.level }}
+SlurmdLogFile={{ slurmddebug.log }}
 {% else %}
 #SlurmdDebug=
 #SlurmdLogFile=
 {% endif %}
-{% if slurmschedlog and slurmschedlogfile %}
-SlurmSchedlogLevel={{ slurmschedlog }}
-SlurmSchedLogFile={{ slurmschedlogfile }}
+{% if slurmschedlog %}
+SlurmSchedlogLevel={{ slurmschedlog.level }}
+SlurmSchedLogFile={{ slurmschedlog.log }}
 {% else %}
 #SlurmSchedlogLevel=
 #SlurmSchedLogFile=
@@ -104,15 +104,15 @@ JobCompType=jobcomp/none
 #
 AccountingStorageType=accounting_storage/slurmdbd
 AccountingStorageHost={{ slurmctrl }}
-AccountingStorageEnforce=limits,safe
+#AccountingStorageEnforce=limits,safe
 #AccountingStorageLoc=
 #AccountingStoragePass=
 #AccountingStorageUser=
 #
 
 # Fair share
-{% if slurmfairshare %}
-PriorityWeightFairshare={{ slurmfairshare }}
+{% if slurmfairshare.def %}
+PriorityWeightFairshare={{ slurmfairshare.val }}
 {% endif %}
 
 DisableRootJobs=YES
diff --git a/roles/slurmdb/tasks/main.yml b/roles/slurmdb/tasks/main.yml
index 07d6bbeb1c68d84df7d596938b5fe94d73298b3d..20efae1709678d10bf93057f2d7ebef054ba9eba 100644
--- a/roles/slurmdb/tasks/main.yml
+++ b/roles/slurmdb/tasks/main.yml
@@ -1,4 +1,25 @@
 ---
+- name: install deps in control node
+  yum: name={{ item }} state=installed
+  sudo: true
+  with_items:
+    - mysql
+    - mysql-server
+    - mysql-devel
+    - MySQL-python
+
+- name: "Start the Server"
+  service: "name=mysqld enabled=yes state=restarted"
+  sudo: true
+
+- name: install mysql local root password 
+  mysql_user: check_implicit_admin=True login_user=root login_password="{{ slurmDbRootPassword }}" name=root password="{{ slurmDbRootPassword }}" state=present
+  sudo: true
+
+- name: create slurmdb group
+  group: name=slurmdb system=yes
+  sudo: true
+
 - name: create slurmdb user
   user: name=slurmdb group=slurmdb system=yes createhome=no
   sudo: true
@@ -7,7 +28,11 @@
   template: src=slurmdbd.conf.j2 dest=/etc/slurm/slurmdbd.conf
   sudo: true
 
-- name: slurm db template 
-  template: src=slurmdb.sh.j2 dest=/etc/slurm/slurmdb.sh
+- name: configure database slurmdb localhost
+  mysql_user: login_user=root login_password="{{ slurmDbRootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host=localhost priv=*.*:ALL,GRANT state=present
   sudo: true
-  notify: restart slurmdbd
+
+- name: configure database slurmdb domain 
+  mysql_user: login_user=root login_password="{{ slurmDbRootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
+  sudo: true
+
diff --git a/roles/slurmdb/templates/my.cnf.j2 b/roles/slurmdb/templates/my.cnf.j2
new file mode 100644
index 0000000000000000000000000000000000000000..d36bc9b390e8396f87a87c63e87b22c3ffd2428b
--- /dev/null
+++ b/roles/slurmdb/templates/my.cnf.j2
@@ -0,0 +1,3 @@
+[client]
+user=root
+password={{ slurmDbRootPassword }}
diff --git a/roles/slurmdb/templates/slurmdbd.conf.j2 b/roles/slurmdb/templates/slurmdbd.conf.j2
index fbc4a56d4c58304a63133ab0b0258deed8802b02..432c5357e7fbd124f8bdbaa77e5bea8a39628673 100644
--- a/roles/slurmdb/templates/slurmdbd.conf.j2
+++ b/roles/slurmdb/templates/slurmdbd.conf.j2
@@ -22,9 +22,9 @@ DbdHost={{ slurmctrl }}
 SlurmUser=slurm
 #MessageTimeout=300
 #DefaultQOS=normal,standby
-{% if slurmschedlog and slurmschedlogfile %}
-DebugLevel={{ slurmschedlog }}
-LogFile={{ slurmschedlogfile }}
+{% if slurmdbdlog %}
+DebugLevel={{ slurmdbdlog.level }}
+LogFile={{ slurmdbdlog.log }}
 {% else %}
 #DebugLevel=
 #LogFile=