Merge branch 'xorgconf_template' into 'master'

tempalte xorg.conf when running on a node with 1GPU (this template works for M3 …

See merge request !119

roles/gpu/tasks/main.yml

@@ -141,3 +141,9 @@
   become_user: root
   args: 
     creates: /etc/X11/xorg.conf
+
+- name: Template xorg.conf for nodes with one GPU
+  template: src=xorg.conf.j2 dest=/etc/X11/xorg.conf
+  become: true
+  become_user: root
+  when: template_xorgconf is defined and template_xorgconf

roles/gpu/templates/xorg.conf.j2

 # nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 340.58  (buildmeister@swio-display-x86-rhel47-09)  Fri Oct 31 17:40:05 PDT 2014
-Section "DRI"
-	Mode 0660
-	Group "vglusers"
-EndSection
+# nvidia-xconfig:  version 352.93  (buildmeister@swio-display-x86-rhel47-07)  Tue Apr  5 18:55:28 PDT 2016
 
 Section "ServerLayout"
     Identifier     "Layout0"
@@ -27,11 +23,9 @@ Section "InputDevice"
 EndSection
 
 Section "InputDevice"
-    # generated from data in "/etc/sysconfig/keyboard"
+    # generated from default
     Identifier     "Keyboard0"
     Driver         "kbd"
-    Option         "XkbLayout" "us"
-    Option         "XkbModel" "pc105"
 EndSection
 
 Section "Monitor"
@@ -47,7 +41,8 @@ Section "Device"
     Identifier     "Device0"
     Driver         "nvidia"
     VendorName     "NVIDIA Corporation"
-    BusID          "PCI:00:06:0"
+    BoardName      "GRID K1"
+    BusID          "PCI:0:6:0"
 EndSection
 
 Section "Screen"
@@ -55,6 +50,7 @@ Section "Screen"
     Device         "Device0"
     Monitor        "Monitor0"
     DefaultDepth    24
+    Option         "UseDisplayDevice" "none"
     SubSection     "Display"
         Depth       24
     EndSubSection