Merge branch 'fix_gres.conf' into 'master'

Fix gres.conf

See merge request !181

roles/slurm-common/files/scripts/nvidia-probe.py

@@ -23,7 +23,7 @@ import os
 import json
 
 try:
-	#run nvidia-smi -L to parse output
+    #run nvidia-smi -L to parse output
         p = subprocess.Popen(['nvidia-smi', '-L'], stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
         out, err = p.communicate()
@@ -48,9 +48,9 @@ try:
                 if os.path.exists(devicePath):
                         #print "OK"
                         deviceList.append( { 'name':'gpu' , 'file': devicePath, 'type':typeOfDevice } )
- 		else:
-                        #print "Error file not found ",devicePath
-			sys.exit(0)
+                else:
+                    print("error looking for nvidia device")
+                    sys.exit(1)
         #now convert list to json 
         output=json.dumps(deviceList)
         print output

roles/slurm-common/templates/gres.conf.j2

 #slurm gres file for {{ ansible_hostname }} 
 #No Of Devices={{ slurm_gres_list | length }}
 {% for gr in slurm_gres_list %}
-Name={{ gr.name }} Type={{ gr.type }} File={{ gr.file }} CPUs={{ cpucount.stdout }}
+Name={{ gr.name }} Type={{ gpumap[gr.type] }} File={{ gr.file }} CPUs={{ cpucount.stdout }}
 {% endfor %}