Merge pull request #68 from CVL-GitHub/m2cvlbranch

M2cvlbranch

roles/openLdapClient/tasks/configLdapClient.yml

@@ -43,10 +43,6 @@
   template: src=ldap.conf.j2 dest=/etc/openldap/ldap.conf
   sudo: true
 
-- name: "Copy pam xserver file "
-  template: src=xserver.j2 dest=/etc/pam.d/xserver
-  sudo: true
-
 - name: "Add LDAP server IP address to /etc/hosts"
   lineinfile: dest=/etc/hosts line="{{ ldapServerHostIpLine }}" state=present insertafter=EOF
   sudo: true

roles/setupKnownHosts/templates/known_hosts.j2

@@ -10,6 +10,5 @@
 {% endfor %}
 
 {% for host in nodelist|unique %}
-{{ host.name }} {{ host.rsa }}
-{{ host.ip }} {{ host.rsa }}
+{{ host.ip }} {{ host.name }} {{ host.rsa }}
 {% endfor %}

roles/slurm-provision/tasks/main.yml

+---
+- name: copy slurm provision template 
+  template: src=slurm_provision.sh.j2 dest={{ slurm_provision }} mode=755 owner=root
+  sudo: true
+
+- name: slurm cron job 
+  cron: name=slurm-provision job={{ slurm_provision }} user=root minute=*/5 state=present
+  sudo: true

roles/slurm-provision/templates/slurm_provision.sh.j2

+#!/bin/sh
+
+CVL_HOME="/cvl/home"
+user_list=($(getent passwd | cut -d ":" -f1))
+log_file="/root/slurm.log"
+
+for user in ${user_list[*]}; do
+    uid=$(id -u ${user})
+    gid=$(id -g ${user})
+    user_home=${CVL_HOME}/${user}
+    if [[ ! -d ${user_home} && ${uid} -gt 1000 ]]; then
+        mkdir -p ${user_home}
+        cp -r /etc/skel/* ${user_home}
+        chown -R ${uid}:${gid} ${user_home}
+        chmod 700 ${user_home}
+
+        account={{ projectname }}
+        cluster={{ clustername }}
+
+        find=$(sacctmgr list cluster ${cluster} | grep ${cluster})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add cluster ${cluster}" || { echo "error to create cluster ${cluster}" >> ${log_file} && exit 1; }
+        fi
+        find=$(sacctmgr list account ${account} | grep ${account})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add account ${account} Description=CVL Organization=monash cluster=${cluster}" || { echo "error to create account ${account}" >> ${log_file} && exit 1; }
+        fi
+        find=$(sacctmgr list user ${username} | grep ${username})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add user ${username} account=${account} cluster=${cluster}" || { echo "error to create user ${username}" >> ${log_file} && exit 1; }
+        fi
+    fi
+done
+
+

roles/slurm-provision/templates/slurm_provision.sh.j2.v1

+#!/bin/sh
+
+CVL_HOME="/cvl/home"
+user_list=($(getent passwd | cut -d ":" -f1))
+log_file="/root/slurm.log"
+
+for user in ${user_list[*]}; do
+    uid=$(id -u ${user})
+    gid=$(id -g ${user})
+    user_home=${CVL_HOME}/${user}
+    if [ ! -d ${user_home} ]; then
+        mkdir -p ${user_home}
+        cp -r /etc/skel/* ${user_home}
+        chown -R ${uid}:${gid} ${user_home}
+        chmod 700 ${user_home}
+
+        account={{ projectname }}
+        cluster={{ clustername }}
+        find=$(sacctmgr list cluster ${cluster} | grep ${cluster})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add cluster ${cluster}" || { echo "error to create cluster ${cluster}" >> ${log_file} && exit 1; }
+        fi
+        find=$(sacctmgr list account ${account} | grep ${account})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add account ${account} Description=CVL Organization=monash cluster=${cluster}" || { echo "error to create account ${account}" >> ${log_file} && exit 1; }
+        fi
+        find=$(sacctmgr list user ${username} | grep ${username})
+        if [ -z "${find}" ]; then
+            su slurm -c "sacctmgr -i add user ${username} account=${account} cluster=${cluster}" || { echo "error to create user ${username}" >> ${log_file} && exit 1; }
+        fi
+    fi
+done
+
+

roles/slurm-provision/vars/readme.txt

+slurm_provision: "/usr/local/sbin/slurmu_provision.sh"