ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: support log rotation for tcmu-runner 

This commit adds the log rotation support for tcmu-runner.

ceph-container related PR: ceph/ceph-container#1726

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1873915

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit f576c02ff7)
pull/5801/head v4.0.33
Guillaume Abrioux 2020-09-15 09:48:31 +02:00 committed by Dimitri Savineau
parent fbc375387a
commit c60a7ad4f6
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
roles/ceph-infra/templates/logrotate.conf.j2
View File

@ -10,3 +10,16 @@
notifempty notifempty
su root root su root root
} }
/var/log/tcmu-runner/*.log {
rotate 7
daily
compress
sharedscripts
postrotate
killall -q -1 tcmu-runner || pkill -1 -x "tcmu-runner"
endscript
missingok
notifempty
su root root
}

1
roles/ceph-iscsi-gw/tasks/containerized.yml
View File

@ -6,6 +6,7 @@
with_items: with_items:
- rbd-target-api - rbd-target-api
- rbd-target-gw - rbd-target-gw
- tcmu-runner
- name: include_tasks systemd.yml - name: include_tasks systemd.yml
include_tasks: systemd.yml include_tasks: systemd.yml

2
roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
View File

@ -32,7 +32,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
-v /dev:/dev \ -v /dev:/dev \
-v /lib/modules:/lib/modules \ -v /lib/modules:/lib/modules \
-v /etc/ceph:/etc/ceph \ -v /etc/ceph:/etc/ceph \
-v /var/log/ceph:/var/log/ceph:z \ -v /var/log/tcmu-runner:/var/log/tcmu-runner:z \
-e CLUSTER={{ cluster }} \ -e CLUSTER={{ cluster }} \
-e CEPH_DAEMON=TCMU_RUNNER \ -e CEPH_DAEMON=TCMU_RUNNER \
-e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \ -e CONTAINER_IMAGE={{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \