diff --git a/roles/config_repos/tasks/main.yml b/roles/config_repos/tasks/main.yml
index 7ca82a84731bea394453dc4d9a07d24a90f640fe..6d2efb6b166f5be9d2e4d3efaeee94ecef7e3058 100644
--- a/roles/config_repos/tasks/main.yml
+++ b/roles/config_repos/tasks/main.yml
@@ -9,18 +9,12 @@
   sudo: true
   when: ansible_os_family == 'RedHat'
 
-
-- name: add epel on CentOS 7
-  shell: rpm -iUvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
-  sudo: true
-  when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
-  ignore_errors: true
-
 - 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
diff --git a/roles/gluster_server/tasks/main.yml b/roles/gluster_server/tasks/main.yml
index 0d7660cc275ec7563112a46afe89e894a0640219..5b5248e3c6e5c8eaaf261431e024b59608468fee 100644
--- a/roles/gluster_server/tasks/main.yml
+++ b/roles/gluster_server/tasks/main.yml
@@ -24,25 +24,6 @@
   sudo: true
   when: ansible_os_family == 'Debian'
 
-- name: make server list
-  set_fact: 
-    server_list: "{{ gluster_servers|join(',') }}"
-
-
-- name: echo server list
-  debug: var=server_list
-
 - name: make brick dir
   file: state=directory path="{{ brickmnt }}/brick"
   sudo: true
-
-- name: create volume
-  gluster_volume: 
-    name: "{{ volname }}"
-    brick: "{{ brickmnt }}/brick"
-    cluster: "{{ server_list }}"
-    replicas: "{{ replicas }}"
-    state: present
-  sudo: true
-  run_once: true
-
diff --git a/roles/gluster_volcreate/tasks/main.yml b/roles/gluster_volcreate/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a85e8291281cf3139b4c7854a4cdbbd1d8d1c229
--- /dev/null
+++ b/roles/gluster_volcreate/tasks/main.yml
@@ -0,0 +1,16 @@
+--
+
+- name: make server list
+  set_fact: 
+    server_list: "{{ gluster_servers|join(',') }}"
+
+- name: create volume
+  gluster_volume: 
+    name: "{{ volname }}"
+    brick: "{{ brickmnt }}/brick"
+    cluster: "{{ server_list }}"
+    replicas: "{{ replicas }}"
+    state: present
+  sudo: true
+  run_once: true
+
diff --git a/roles/ldapclient/tasks/configLdapClient.yml b/roles/ldapclient/tasks/configLdapClient.yml
index 4b91158eed7187ebd807b0d995e306aa023d2d03..5b667f2e4f348690bf4993b29539557f3d8907c4 100644
--- a/roles/ldapclient/tasks/configLdapClient.yml
+++ b/roles/ldapclient/tasks/configLdapClient.yml
@@ -4,39 +4,47 @@
   with_items:
     - pam_ldap.conf
     - nsswitch.conf
-  sudo: true
+  become: true
+  become_user: root
 
 - name: "make basedir"
-  file: path="{{ ldapCaCertFile | dirname }}" state=directory owner=root
-  sudo: true
+  file: path="{{ ldapCaCertFile | dirname }}" state=directory owner=root follow=yes
+  become: true
+  become_user: root
   ignore_errors: true
 
 - name: "Copy the CA cert"
   copy: src={{ ldapCaCertSrc }} dest={{ ldapCaCertFile }} owner=root mode=644
-  sudo: true
+  become: true
+  become_user: root
   when: ldapCaCertSrc is defined
 
 - name: "Template CA cert"
   template: src=ldapCaCert.j2 dest={{ ldapCaCertFile }} owner=root mode=644
-  sudo: true
+  become: true
+  become_user: root
   when: ldapCaCertContents is defined
 
 - name: "Copy system auth"
   template: src=system-auth.j2 dest=/etc/pam.d/system-auth
-  sudo: true
+  become: true
+  become_user: root
 
 - name: "Copy password auth"
   template: src=password-auth.j2 dest=/etc/pam.d/password-auth
-  sudo: true
+  become: true
+  become_user: root
 
 - name: "Add LDAP server IP address to /etc/hosts"
   lineinfile: dest=/etc/hosts line="{{ ldapServerHostIpLine }}" state=present insertafter=EOF
-  sudo: true
+  become: true
+  become_user: root
   when: ldapServerHostIpLine is defined
 
 - name: "Copy sssd.conf to ldap client"
   template: src=sssd.j2 dest=/etc/sssd/sssd.conf owner=root group=root mode=600
-  sudo: true
+  become: true
+  become_user: root
   notify: restart sssd
 
 - name: "Make the cache a tmpfs"
@@ -46,4 +54,5 @@
 
 - name: "start sssd"
   service: name=sssd state=started enabled=yes
-  sudo: true
+  become: true
+  become_user: root