Merge branch 'master' into 'master'

Master

Simon's changes to support ubuntu with mellanox and slurm

See merge request !2

roles/modulefiles/tasks/main.yml

@@ -16,6 +16,7 @@
     line: /usr/local/Modules/modulefiles
   ignore_errors: true
   sudo: true
+  when: ansible_os_family == 'RedHat'
 
 # for some reason ubuntu uses lowercase modules
 - name: add /usr/local/Modules to the module file path

roles/move_homedir/tasks/main.yml

@@ -19,6 +19,7 @@
   sudo: true
   register: edit1
 
+
 - name: edit passwd file
   lineinfile:
   args:
@@ -29,6 +30,8 @@
   sudo: true
   register: edit2
 
+
+
 - name: edit passwd file
   lineinfile:
   args:
@@ -39,3 +42,14 @@
   sudo: true
   register: edit3
 
+# ubuntu:x:1000:1000:Ubuntu:/home/ubuntu:/bin/bash
+- name: edit passwd file for ubuntu 14
+  lineinfile:
+  args:
+    dest: /etc/passwd
+    regexp: "{{ ansible_ssh_user }}:x:1000:1000:Ubuntu:/home/{{ ansible_ssh_user }}:.*"
+    line: "{{ ansible_ssh_user }}:x:1000:1000:Ubuntu:/local_home/{{ ansible_ssh_user }}:/bin/bash"
+    backrefs: yes
+  sudo: true
+  register: edit4
+

roles/slurm-common/tasks/main.yml

@@ -136,7 +136,6 @@
 - name: setup envirnment variables 
   template: src=slurm_setup.sh.j2 dest=/etc/profile.d/slurm_setup.sh
   sudo: true
-  when: ansible_os_family == 'RedHat' 
 
 - name: setup plugin
   template: src=job_submit.lua.j2 dest={{ slurm_dir }}/etc/job_submit.lua