diff --git a/roles/etcHosts/files/makehosts.py b/roles/etcHosts/files/makehosts.py
index 9f68ef107f505358189f44f7562948b67697267f..fa830d92bc5dbc768a462fe87750a35f92d542c2 100755
--- a/roles/etcHosts/files/makehosts.py
+++ b/roles/etcHosts/files/makehosts.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/python
 import sys
 import json
 import socket
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index a1029fa022cb7c4f8ebd1cb91927ac223ed79753..9d8e8fe8aeb9436e8afcbe54f882f036b389ed36 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/roles/etcHosts/tasks/main.yml
@@ -9,7 +9,7 @@
   run_once: True
 
 - name: make hosts data
-  shell: source /root/.bash_profile; /tmp/makehosts.py /tmp/groups {{ domain }}
+  command: /tmp/makehosts.py /tmp/groups {{ domain }}
   delegate_to: 127.0.0.1
   run_once: True
   register: hosts_data
diff --git a/roles/ldapserver/tasks/main.yml b/roles/ldapserver/tasks/main.yml
index 86c6b1f01bb922af0fb434cd24c16747ef939f6a..1a2ab0e0077240a74ca20f89890cd5dce86af78f 100644
--- a/roles/ldapserver/tasks/main.yml
+++ b/roles/ldapserver/tasks/main.yml
@@ -145,6 +145,7 @@
   with_items:
    - ppolicy
    - cosine
+   - nis
   ignore_errors: true
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
 
diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml
index c01b5f805e91f53ed9918ddd1a95d6945271384e..a172b990bfd8ea1f694d1c6fbd309b443eca09ec 100644
--- a/roles/slurm-common/tasks/installSlurmFromSource.yml
+++ b/roles/slurm-common/tasks/installSlurmFromSource.yml
@@ -1,3 +1,13 @@
+- name: remove all install
+  shell: rm -rf /tmp/slurm-{{ slurm_version }}
+  sudo: true 
+  when: force_slurm_recompile is defined
+
+- name: remove all install
+  shell: rm -rf {{ slurm_dir }}
+  sudo: true 
+  when: force_slurm_recompile is defined
+
 - name: get slurm
   shell: wget https://cvl.massive.org.au/slurm-{{ slurm_version }}.tar.bz2
 #  shell: wget http://www.schedmd.com/download/archive/slurm-{{ slurm_version }}.tar.bz2
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 8a22cc68de4a29ebaaab94642227c483ace4c061..e4c4629ca00cdb66d149a28f0519804211f4d4a8 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -54,8 +54,6 @@
     - perl
     - perl-DBI
     - openssl-devel
-    - mysql
-    - mysql-devel
     - gcc
     - rpm-build
     - wget
@@ -83,11 +81,9 @@
     - make
     - perl
     - libdbi-perl
-    - mysql-server
-    - mysql-client
-    - python-mysqldb
-    - libmysqlclient-dev
     - lua5.2
+    - hwloc
+    - libhwloc-dev
   when: ansible_os_family == "Debian"
 
 - include: installMungeFromSource.yml
diff --git a/roles/slurm-sql/tasks/main.yml b/roles/slurm-sql/tasks/main.yml
index 954d595256a508d42143addca7a03b77e17ba00f..fb0948097b1eb50a3a90b0ffa22e22c3df990f7a 100644
--- a/roles/slurm-sql/tasks/main.yml
+++ b/roles/slurm-sql/tasks/main.yml
@@ -11,6 +11,7 @@
   sudo: true
   with_items:
     - mysql-server
+    - python-mysqldb
   when: ansible_os_family == "Debian"
 
 - name: "Start the Server"
diff --git a/roles/slurmdb-config/tasks/main.yml b/roles/slurmdb-config/tasks/main.yml
index 8d9fbd00d0878390f4542c10474da580777ae57e..71c0b92869fe3e1564a803cfe52493c00f053bb2 100644
--- a/roles/slurmdb-config/tasks/main.yml
+++ b/roles/slurmdb-config/tasks/main.yml
@@ -13,6 +13,7 @@
   sudo: true
   with_items:
     - mysql-client
+    - libmysqlclient-dev
     - python-mysqldb
   when: ansible_os_family == "Debian"
 
@@ -31,7 +32,3 @@
   sudo: true
   when: slurm_dir is not defined
 
-- name: sanity check slurmdbd service
-  service: "name=slurmdbd enabled=yes state=started"
-  sudo: true
-