From 8de4715d91ca1752b0daf5c578d4a820f3dea3b7 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Wed, 18 Feb 2015 02:53:05 +0000
Subject: [PATCH] Add sanity check for directories
---
roles/cvl-menus/tasks/main.yml | 8 +++++++-
roles/slurm/tasks/main.yml | 6 ++++++
roles/slurmdb/tasks/main.yml | 4 ++--
roles/slurmdb/templates/slurmdbd.conf.j2 | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/roles/cvl-menus/tasks/main.yml b/roles/cvl-menus/tasks/main.yml
index bc6cdf0..b103cde 100644
--- a/roles/cvl-menus/tasks/main.yml
+++ b/roles/cvl-menus/tasks/main.yml
@@ -1,9 +1,15 @@
+- name: Sanity check menu directory
+ shell: mkdir -p /etc/xdg/menus/applications-merged
+ args:
+ creates: "/etc/xdg/menus/applications-merged"
+ sudo: true
+
- name: configure the cvl menues
copy: src=cvl.menu dest=/etc/xdg/menus/applications-merged/cvl.menu mode=644 owner=root group=root
sudo: true
- name: configure the cvl backgroud image
- copy: src={{ item }} dest=/usr/share/backgrounds/i{{ item }} mode=644 owner=root group=root
+ copy: src={{ item }} dest=/usr/share/backgrounds/{{ item }} mode=644 owner=root group=root
with_items:
- cvl_desktop.svg
- default.xml
diff --git a/roles/slurm/tasks/main.yml b/roles/slurm/tasks/main.yml
index af6536a..1cc85b9 100644
--- a/roles/slurm/tasks/main.yml
+++ b/roles/slurm/tasks/main.yml
@@ -49,6 +49,12 @@
notify: restart slurm
when: slurm_use_vpn==True
+- name: create data directory
+ shell: mkdir -p /var/spool/slurm
+ args:
+ creates: "/var/spool/slurm"
+ sudo: true
+
- name: create log directory
shell: mkdir -p {{ slurmddebug.log | dirname }}
args:
diff --git a/roles/slurmdb/tasks/main.yml b/roles/slurmdb/tasks/main.yml
index 24b4ce6..c332c56 100644
--- a/roles/slurmdb/tasks/main.yml
+++ b/roles/slurmdb/tasks/main.yml
@@ -29,11 +29,11 @@
sudo: true
# notify: restart slurmdb
-- name: sanitic check service
+- name: sanity check slrumdbd service
service: "name=slurmdbd enabled=yes state=started"
sudo: true
-- name: sanitic check service
+- name: sanity check slurm service
service: "name=slurm enabled=yes state=started"
sudo: true
diff --git a/roles/slurmdb/templates/slurmdbd.conf.j2 b/roles/slurmdb/templates/slurmdbd.conf.j2
index 432c535..bec8e96 100644
--- a/roles/slurmdb/templates/slurmdbd.conf.j2
+++ b/roles/slurmdb/templates/slurmdbd.conf.j2
@@ -38,7 +38,7 @@ PidFile=/var/run/slurmdbd.pid
StorageType=accounting_storage/mysql
StorageHost={{ slurmctrl }}
#StoragePort=1234
-StoragePass=password
+StoragePass={{ slurmDbPassword }}
StorageUser=slurmdb
StorageLoc=slurm_acct_db
--
GitLab