From 6e8f5a36898c6b99eee57649afdbb279947e64c2 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 6 Sep 2016 11:57:00 +1000
Subject: [PATCH] since nvidia-probe always outputs valid json now, remove
unncessary conditionals
Former-commit-id: fe33ed197dd3f647750632bb513d626bcd9119fb
---
roles/slurm-common/tasks/main.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 255948e1..9290f529 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -88,11 +88,8 @@
script: scripts/nvidia-probe.py
register: probeOutput
-- set_fact: slurm_gres_list= "[ ]"
-
- name: "set nvidiaprobe slurm_gres_list"
- set_fact: "slurm_gres_list={{ probeOutput.stdout | from_json }}"
- when: probeOutput.stdout is defined and ( probeOutput.stdout|length !=0 )
+ set_fact: "slurm_gres_list={{ probeOutput.stdout }}"
- name: template gres.conf file
template: src="gres.conf.j2" dest={{ slurm_dir }}/etc/gres/gres.conf mode=644
--
GitLab