better template for gres.conf allowing for Grid K1 GPUS and different CPU counts

Former-commit-id: 2aee70cb

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

@@ -35,7 +35,7 @@ try:
                 if not line :
                         break
                 #print "Line is ",line
-                pe=re.compile('GPU\s*(\d*).*Tesla\s*(\S*)')
+                pe=re.compile('GPU\s+(\d*):\s+\S+\s+(\S*)')
                 m=pe.search(line)
                 if not m:
                         #print "No match found"

roles/slurm-common/tasks/main.yml

@@ -90,6 +90,11 @@
   register: probeOutput
   check_mode: no
 
+- name: get cpu count
+  shell: 'lscpu | grep "On-line CPU" | cut -f 2 -d ":" | sed "s/\ *//g"'
+  register: cpucount
+  check_mode: no
+
 - name: "set nvidiaprobe slurm_gres_list"
   set_fact: "slurm_gres_list={{  probeOutput.stdout }}"
 

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=0-23
+Name={{ gr.name }} Type={{ gr.type }} File={{ gr.file }} CPUs={{ cpucount.stdout }}
 {% endfor %}