Merge branch 'minor_fixes' into 'master'

Minor fixes

See merge request !44

roles/enable_lmod/vars/main.yml

 ---
 source_dir: /tmp
-soft_dir: /usr/local
+soft_dir: /opt/lmod/
 lmod_version: 5.8.6

roles/gluster_client/tasks/main.yml

@@ -13,6 +13,6 @@
   sudo: true
 
 - name: mount volume
-#mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,_netdev,backupvolfile-server={{ gluster_servers[1] }}"
-  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,backupvolfile-server={{ gluster_servers[1] }},comment=systemd.automount"
+  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,_netdev,backupvolfile-server={{ gluster_servers[1] }}"
+#  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,_netdev,acl,backupvolfile-server={{ gluster_servers[1] }},comment=systemd.automount"
   sudo: true

roles/lmod/vars/main.yml

 ---
 source_dir: /tmp
-soft_dir: /usr/local
+soft_dir: /opt/lmod/
 lmod_version: 5.8.6

roles/nagios_monitored/files/scripts/check_munge

@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_munge=subprocess.Popen("service munge status", shell=True, stdout=subprocess.PIPE)
+check_munge=subprocess.Popen(["/sbin/service","munge","status"], shell=False, stdout=subprocess.PIPE)
 munge_status=check_munge.communicate()[0]
 
 if "run" in munge_status:

roles/nagios_monitored/files/scripts/check_slurm

@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_slurm=subprocess.Popen("service slurm status", shell=True, stdout=subprocess.PIPE)
+check_slurm=subprocess.Popen(["/sbin/service","slurm","status"], shell=False, stdout=subprocess.PIPE)
 slurm_status=check_slurm.communicate()[0]
 
 if "run" in slurm_status:

roles/nagios_monitored/files/scripts/check_slurmdbd

@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_slurmdbd=subprocess.Popen("service slurmdbd status", shell=True, stdout=subprocess.PIPE)
+check_slurmdbd=subprocess.Popen(["/sbin/service","slurmdbd","status"], shell=False, stdout=subprocess.PIPE)
 slurmdbd_status=check_slurmdbd.communicate()[0]
 
 if "run" in slurmdbd_status:

roles/provision_homedir/templates/provision_homedir.py.j2

@@ -63,11 +63,17 @@ s.bindpw="{{ ldapBindDNPassword }}"
 s.baseDN="{{ ldapBase }}"
 s.searchFilter = "{{ search_filter }}"
 homeDirEntry= "{{ homeDirEntry }}"
+homebase = "{{ homebase }}"
+
 
 users=get_users(s)
 for user in users:
 	try:
-		mk_homedir(users[user].entry[homeDirEntry][0],int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0]))
+                if homebase != "":
+                    path=homebase+"/"+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]))
 	except:
 		print traceback.format_exc()
 		pass

roles/provision_homedir/vars/main.yml

@@ -3,3 +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: ""