Merge branch 'provision_homedir' into 'master'

update provision_homedir, pass the mntpt variable to indicate where homedirectories are mounted



See merge request !68

roles/provision_homedir/tasks/main.yml

@@ -19,5 +19,5 @@
 
 # the lockfile for makeing home directories should be located on the shared directory where the home directories will be created. Otherwise it will be racey
 - name: provision_homedir cron job 
-  cron: name=provision_homedir job="/usr/bin/flock -x -n /home/provision.lck -c {{ provision_homedir }}" user=root minute=*/30 state=present
+  cron: name=provision_homedir job="/usr/bin/flock -x -n {{ mnthome }}/home/provision.lck -c {{ provision_homedir }}" user=root minute=*/30 state=present
   sudo: true

roles/provision_homedir/templates/provision_homedir.py.j2

@@ -63,14 +63,14 @@ s.bindpw="{{ ldapBindDNPassword }}"
 s.baseDN="{{ ldapBase }}"
 s.searchFilter = "{{ search_filter }}"
 homeDirEntry= "{{ homeDirEntry }}"
-homebase = "{{ homebase }}"
+mnthome = "{{ mnthome }}"
 
 
 users=get_users(s)
 for user in users:
 	try:
-                if homebase != "":
-                    path=homebase+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1]
+                if mnthome != "":
+                    path=mnthome+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1]
                 else:
                     path=users[user].entry[homeDirEntry][0]
 		mk_homedir(path,int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0]))

roles/provision_homedir/vars/main.yml

@@ -3,4 +3,4 @@ use_active_directory: False
 provision_homedir: /usr/local/sbin/provision_homedir.py
 homeDirEntry: "{% if use_active_directory %}unixHomeDirectory{% else %}homeDirectory{% endif %}"
 search_filter: "{% if use_active_directory %}(unixHomeDirectory=*){% else %}(objectClass=posixAccount){% endif %}"
-homebase: ""
+mnthome: "{% if mntpt %}{{ mntpt }}{% else %}''{% endif %}"