Merge branch 'deploy-xorg' into 'master'

Added check to copy over xorg.conf for n3f

See merge request hpc-team/ansible_cluster_in_a_box!251

roles/deploy-xorg/tasks/main.yml

@@ -9,8 +9,15 @@
     nvidiacardslist: "{{ nvidiacards.stdout | from_json }}"
 
 - name: generate nvidia-xorg-conf
-  sudo: true
+  become: yes
+  become_user: root
   template:
     src: xorg.conf.j2
     dest: "{{ item['filename'] }}"
   with_items: "{{ nvidiacardslist }}"
+
+- name: copy xorg.conf.10 xorg.conf for m3f nodes
+  become: yes
+  become_user: root
+  command: cp /etc/X11/xorg.conf.10 /etc/X11/xorg.conf
+  when: "'m3f' in ansible_hostname"