diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml index c08257b8bbd7772783d049b867a1b940f57198d4..ec9fbe5881b3188383da27589821cde48da977fa 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 f9042d6b392781293a35c0c4d70f09f63813e809..0000000000000000000000000000000000000000 --- 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 aa3323f100099f3037206ab18e3f6afefbb35418..becf45105eff2e253c41da10feb35d8afa05f620 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 +