From 8a866564a53fa8cdfdccd10c6627e83ce28857f9 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 29 Sep 2015 14:52:48 +1000
Subject: [PATCH] update the provisioning role to fix some problems
---
roles/provision/tasks/main.yml | 4 ++++
roles/provision/templates/provision.sh.j2 | 2 +-
roles/provision/vars/main.yml | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/roles/provision/tasks/main.yml b/roles/provision/tasks/main.yml
index 27a2cbb..c5d13aa 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 d4082c8..0c70a39 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 ed97d53..b1cfa09 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"
+
--
GitLab