diff --git a/roles/cvlExtraFiles/vars/readme.txt b/roles/cvlExtraFiles/vars/readme.txt index 088e9f2cb2742bc5db6e3956f017661da3b908c5..6aae5abbb4a3f6cdd16a8082efc38473f74fc6ea 100644 --- a/roles/cvlExtraFiles/vars/readme.txt +++ b/roles/cvlExtraFiles/vars/readme.txt @@ -1,6 +1,5 @@ --- extraFiles: - - {src: '/usr/local/lib/ld-linux.so.2', dest: '/lib/ld-linux.so.2', type: 'link'} - {src: '/usr/local/etc/sshfs_default_sites.cfg', dest: '/etc/sshfs_default_sites.cfg', type: 'link'} - {src: '/usr/local/etc/vnc/turbovncserver-auth.conf', dest: '/etc/turbovncserver-auth.conf', type: 'link'} - {src: '/usr/local/etc/vnc/turbovncserver.conf', dest: '/etc/turbovncserver.conf', type: 'link'} diff --git a/roles/slurm/defaults/main.yml b/roles/slurm/defaults/main.yml index 2b482d25ec92db781dfa5ef8e1b56cc33d47940a..362d9cf4ae92e58c49950d6a09dcaaf9df92cba6 100644 --- a/roles/slurm/defaults/main.yml +++ b/roles/slurm/defaults/main.yml @@ -1,8 +1,12 @@ --- -clustername: "CIAB" -slurmctlddebug: {} -slurmddebug: {} -slurmschedlog: {} -slurmdbdlog: {} +slurm_use_vpn: False +slurmctlddebug: {level: 9, log: '/var/log/slurm/slurmctld.log'} +slurmddebug: {level: 9, log: '/var/log/slurm/slurmd.log'} +slurmschedlog: {level: 9, log: '/var/log/slurm/slurmsched.log'} +slurmdbdlog: {level: 9, log: '/var/log/slurm/slurmdbd.log'} slurmfairshare: {def: false, val: 10000} slurmdatadir: "/var/spool/slurm" +slurmselecttype: "select/linear" +slurmfastschedule: "1" +slurmschedulertype: "sched/backfill" + diff --git a/roles/slurm/vars/readme.txt b/roles/slurm/vars/readme.txt deleted file mode 100644 index 85a4b3b5c45162e3e60440d2db917ea4ddbb7b8a..0000000000000000000000000000000000000000 --- a/roles/slurm/vars/readme.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- -slurm_use_vpn: True -slurmctlddebug: {level: 9, log: '/var/log/slurm/slurmctld.log'} -slurmddebug: {level: 9, log: '/var/log/slurm/slurmd.log'} -slurmschedlog: {level: 9, log: '/var/log/slurm/slurmsched.log'} -slurmdbdlog: {level: 9, log: '/var/log/slurm/slurmdbd.log'} -slurmfairshare: {def: false, val: 10000} -slurmdatadir: "/var/spool/slurm" -slurmselecttype: "select/linear" -slurmfastschedule: "1" -slurmschedulertype: "sched/backfill" -