diff --git a/roles/provision/tasks/main.yml b/roles/provision/tasks/main.yml index 27a2cbbd47537625c2e13efa54ff0132b0ab8c4a..c5d13aadd3c4aea253aaec4c556f65acdfe7d5a9 100644 --- a/roles/provision/tasks/main.yml +++ b/roles/provision/tasks/main.yml @@ -1,4 +1,8 @@ --- +- name: make dir + file: path="{{ provision | dirname }}" state=directory mode=755 owner=root + sudo: true + - name: copy provision template template: src=provision.sh.j2 dest={{ provision }} mode=755 owner=root sudo: true diff --git a/roles/provision/templates/provision.sh.j2 b/roles/provision/templates/provision.sh.j2 index d4082c8ae41b59824252396bbc178bdeaf7931ef..0c70a397b8cadb0ab6792a56260948f83a863ee6 100644 --- a/roles/provision/templates/provision.sh.j2 +++ b/roles/provision/templates/provision.sh.j2 @@ -32,7 +32,7 @@ for user in ${user_list[*]}; do 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 ${user} | grep ${user}) + find=$(sacctmgr list user --noheader -p ${user} | grep ${user}) if [ -z "${find}" ]; then su slurm -c "$sacctmgr -i add user ${user} account=${account} cluster=${cluster}" || { echo "error to create user ${user}" >> ${log_file} && exit 1; } fi diff --git a/roles/provision/vars/main.yml b/roles/provision/vars/main.yml index ed97d539c095cf1413af30cc23dea272095b97dd..b1cfa091c1d226185fcff5b4ec03c902db11bfe1 100644 --- a/roles/provision/vars/main.yml +++ b/roles/provision/vars/main.yml @@ -1 +1,5 @@ --- +slurm_provision: "/usr/local/sbin/slurm_provision.sh" +home_dir: "/home" +provision: "/usr/local/sbin/provision.sh" +