From 328f2c49f09bbc5ffba02fbacc3856b5354ad9ef Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Thu, 24 Sep 2015 12:04:16 +1000
Subject: [PATCH] move slurm db log to slurmdb-config
---
.../tasks/installSlurmFromSource.yml | 8 -------
roles/slurm-common/templates/slurmdblog.j2 | 24 -------------------
roles/slurmdb-config/tasks/main.yml | 4 ++++
3 files changed, 4 insertions(+), 32 deletions(-)
delete mode 100644 roles/slurm-common/templates/slurmdblog.j2
diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml
index c08257b8..ec9fbe58 100644
--- a/roles/slurm-common/tasks/installSlurmFromSource.yml
+++ b/roles/slurm-common/tasks/installSlurmFromSource.yml
@@ -36,11 +36,3 @@
- name: add slurm log rotate config
template: src=slurmlog.j2 dest=/etc/logrotate.d/slurm mode=644
sudo: true
-
-- name: add slurm db log rotate config
- template: src=slurmdblog.j2 dest=/etc/logrotate.d/slurmdb mode=644
- sudo: true
- delegate_to: "{{ slurmctrl }}"
- run_once: true
-
-
diff --git a/roles/slurm-common/templates/slurmdblog.j2 b/roles/slurm-common/templates/slurmdblog.j2
deleted file mode 100644
index f9042d6b..00000000
--- a/roles/slurm-common/templates/slurmdblog.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-{{ slurmdbdlog.log }}
-{% endif %}
-{
- compress
- missingok
- nocopytruncate
- nocreate
- nodelaycompress
- nomail
- notifempty
- noolddir
- rotate 5
- sharedscripts
- size=5M
- create 640 slurm root
-{% if ansible_os_family == 'RedHat' and ansible_distribution_version >= '7' %}
- postrotate
- {{ slurm_dir }}/sbin/slurmdbd flushlogs 1>/dev/null || true
-{% else %}
- postrotate /etc/init.d/slurmdbd reconfig
-{% endif %}
- endscript
-}
-
diff --git a/roles/slurmdb-config/tasks/main.yml b/roles/slurmdb-config/tasks/main.yml
index aa3323f1..becf4510 100644
--- a/roles/slurmdb-config/tasks/main.yml
+++ b/roles/slurmdb-config/tasks/main.yml
@@ -32,3 +32,7 @@
sudo: true
when: slurm_dir is not defined
+- name: add slurm db log rotate config
+ template: src=slurmdblog.j2 dest=/etc/logrotate.d/slurmdb mode=644
+ sudo: true
+
--
GitLab