Merge branch 'deploysubmitfilter' into 'master'

Deploysubmitfilter

See merge request hpc-team/ansible_cluster_in_a_box!190

roles/slurm-common/tasks/main.yml

@@ -125,6 +125,11 @@
   sudo: true
   when: slurm_use_vpn==True
 
+- name: install job_submit.lua
+  copy: src=files/job_submit.lua dest={{ slurm_dir }}/etc/job_submit.lua
+  sudo: true
+  when: slurm_use_vpn==False
+
 - name: setup envirnment variables 
   template: src=slurm_setup.sh.j2 dest=/etc/profile.d/slurm_setup.sh
   sudo: true

roles/slurm-common/templates/job_submit.lua.j2

@@ -10,26 +10,17 @@
  For use, this script should be copied into a file name "job_submit.lua"
  in the same directory as the SLURM configuration file, slurm.conf.
 
+
 --]]
 
 function slurm_job_submit(job_desc, part_list, submit_uid)
 
-      if (job_desc.gres and string.find(job_desc.gres,"gpu")) then
-         slurm.log_info("generic resource GPU")
-         job_desc.partition = "vis" 
-         return slurm.SUCCESS
-      end
-end
-
-function slurm_job_modify(job_desc, job_rec, part_list, modify_uid)
-	return slurm.SUCCESS
+if job_desc.account == "default" then
+slurm.log_user("Please specify your project account in your job. You are no longer able to use account=default in M3, if you don't know your project ID, please contact help@massive.org.au ")
+return slurm.ESLURM_INVALID_ACCOUNT
 end
 
 
-log_msg = slurm.log_info
-log_verbose = slurm.log_verbose
-log_debug = slurm.log_debug
-log_err = slurm.error
-log_user = slurm.log_user 
-
 return slurm.SUCCESS
+
+end