diff --git a/roles/enable_lmod/tasks/main.yml b/roles/enable_lmod/tasks/main.yml
index 4676f706030c27b4b86e35a342e26fb3ae9ad74b..5c1ff887b0969578ee0a0aaa52d4603e1472b9c7 100644
--- a/roles/enable_lmod/tasks/main.yml
+++ b/roles/enable_lmod/tasks/main.yml
@@ -1,6 +1,16 @@
 ---
 - include_vars: "{{ ansible_os_family }}.yml"
 
+- name: Install epel-release 
+  yum: name=epel-release-7-5.noarch state=present 
+  sudo: true 
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
+- name: Enable epel 
+  command: yum-config-manager --enable epel 
+  sudo: true
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
 - name: install lua
   yum: name={{ item }} state=installed
   with_items:
diff --git a/roles/gluster_client/tasks/main.yml b/roles/gluster_client/tasks/main.yml
index 75964d8f9f61391b0c6c7b1c1f7fa6664e9dbed6..68d24002695056b5b32337510a22bb5b48f187f6 100644
--- a/roles/gluster_client/tasks/main.yml
+++ b/roles/gluster_client/tasks/main.yml
@@ -12,7 +12,7 @@
   sudo: true
 
 - name: install gluster
-  apt: name=glusterfs state='latest'
+  apt: name=glusterfs-client state='latest'
   when: ansible_os_family == 'Debian'
   sudo: true
 
diff --git a/roles/gluster_server/tasks/main.yml b/roles/gluster_server/tasks/main.yml
index 2abeee927077069549007176b14e3719e2182931..82dcabaa4088bec82eb7168983735fdb9cddae5a 100644
--- a/roles/gluster_server/tasks/main.yml
+++ b/roles/gluster_server/tasks/main.yml
@@ -15,13 +15,19 @@
   sudo: true
 
 - name: install gluster
-  apt: name=glusterfs state='latest'
+  apt: name=glusterfs-server state='latest'
   when: ansible_os_family == 'Debian'
   sudo: true
 
 - name: start daemon
   service: name=glusterd enabled=yes state=started
   sudo: true
+  when: ansible_os_family == 'RedHat'
+
+- name: start daemon
+  service: name=glusterfs-server enabled=yes state=started
+  sudo: true
+  when: ansible_os_family == 'Debian'
 
 - name: make server list
   set_fact: 
diff --git a/roles/lmod/tasks/main.yml b/roles/lmod/tasks/main.yml
index 9f16c8f5f20dcd82482697e2e276e5b3ce8839dc..6c84ac239a44e85745de9f1bc10f5777e085bfb3 100644
--- a/roles/lmod/tasks/main.yml
+++ b/roles/lmod/tasks/main.yml
@@ -12,6 +12,17 @@
 #  sudo: true
 #  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
 
+- name: Install epel-release
+  yum: name=epel-release-7-5.noarch state=present
+  sudo: true
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
+- name: Enable epel
+  command: yum-config-manager --enable epel
+  sudo: true
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
+
 - name: install lua
   yum: name={{ item }} state=installed
   with_items:
diff --git a/roles/mysql/tasks/mysql_server.yml b/roles/mysql/tasks/mysql_server.yml
index a5066a349f9b64ab6636cc63d9f1b67a9869da35..1d2d054f80fcd5aaad722d01186ac9be03c4d358 100644
--- a/roles/mysql/tasks/mysql_server.yml
+++ b/roles/mysql/tasks/mysql_server.yml
@@ -33,3 +33,9 @@
 
 - name: "Giving priviliges to user"
   mysql_user: name={{ mysql_user_name }} host={{ mysql_user_host }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL state=present
+  when: mysql_user_host is defined
+
+- name: "Giving priviliges to user"
+  mysql_user: name={{ mysql_user_name }} host={{ hostvars[item].ansible_fqdn }} password={{ mysql_user_password }} login_user=root login_password={{ mysql_root_password }} priv={{ mysql_user_db_name }}.*:ALL state=present
+  with_items: mysql_user_hosts_group
+  when: mysql_user_hosts_group is defined
diff --git a/roles/slurmdb-config/templates/slurmdblog.j2 b/roles/slurmdb-config/templates/slurmdblog.j2
index f9042d6b392781293a35c0c4d70f09f63813e809..e950c18286cbc00771c94cf520f97dd5fb9d6104 100644
--- a/roles/slurmdb-config/templates/slurmdblog.j2
+++ b/roles/slurmdb-config/templates/slurmdblog.j2
@@ -1,5 +1,4 @@
 {{ slurmdbdlog.log }}
-{% endif %}
 {
  compress
  missingok