From cf4e967fe810e69c341ca16dfe5749094ea1c640 Mon Sep 17 00:00:00 2001
From: Johan Guldmyr <johan.guldmyr@csc.fi>
Date: Mon, 31 Oct 2016 11:35:30 +0200
Subject: [PATCH] make the setting in x11.conf a variable

---
 defaults/main.yml     | 1 +
 templates/x11.conf.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7a6d9ca..2dd7231 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -237,6 +237,7 @@ slurm_AccountingStorageTRES: "gres/gpu:teslak80"
 # plugstack and X11
 slurm_plugstack: False
 slurm_x11_spank: False
+slurm_x11_setting: "optional          x11.so"
 
 slurm_spank_x11_packages:
   - xauth
diff --git a/templates/x11.conf.j2 b/templates/x11.conf.j2
index e63e3a6..89bdecf 100644
--- a/templates/x11.conf.j2
+++ b/templates/x11.conf.j2
@@ -33,5 +33,5 @@
 # forward its X11 display to batch execution node.
 #
 #-------------------------------------------------------------------------------
-optional          x11.so
+{{ slurm_x11_setting }}
 #-------------------------------------------------------------------------------