From: Dimitri Savineau Date: Thu, 17 Sep 2020 18:11:22 +0000 (-0400) Subject: ceph-infra: include iscsi nodes for logrotate X-Git-Tag: v6.0.0alpha2~27 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85643edfe382d34a77fabbd97a4d937b8b74d4e6;p=ceph-ansible.git ceph-infra: include iscsi nodes for logrotate The iscsi nodes aren't included in the logrotate condition. Signed-off-by: Dimitri Savineau --- diff --git a/roles/ceph-infra/tasks/main.yml b/roles/ceph-infra/tasks/main.yml index 77337b6e6..40d5876a1 100644 --- a/roles/ceph-infra/tasks/main.yml +++ b/roles/ceph-infra/tasks/main.yml @@ -33,7 +33,8 @@ inventory_hostname in groups.get(mds_group_name, []) or inventory_hostname in groups.get(rgw_group_name, []) or inventory_hostname in groups.get(mgr_group_name, []) or - inventory_hostname in groups.get(rbdmirror_group_name, []) + inventory_hostname in groups.get(rbdmirror_group_name, []) or + inventory_hostname in groups.get(iscsi_gw_group_name, []) - name: add logrotate configuration template: @@ -49,4 +50,5 @@ inventory_hostname in groups.get(mds_group_name, []) or inventory_hostname in groups.get(rgw_group_name, []) or inventory_hostname in groups.get(mgr_group_name, []) or - inventory_hostname in groups.get(rbdmirror_group_name, []) \ No newline at end of file + inventory_hostname in groups.get(rbdmirror_group_name, []) or + inventory_hostname in groups.get(iscsi_gw_group_name, []) \ No newline at end of file diff --git a/roles/ceph-infra/templates/logrotate.conf.j2 b/roles/ceph-infra/templates/logrotate.conf.j2 index c2ed6c025..e8be47396 100644 --- a/roles/ceph-infra/templates/logrotate.conf.j2 +++ b/roles/ceph-infra/templates/logrotate.conf.j2 @@ -17,7 +17,7 @@ compress sharedscripts postrotate - killall -q -1 tcmu-runner || pkill -1 -x "tcmu-runner" + killall -q -1 tcmu-runner || pkill -1 -x "tcmu-runner" || true endscript missingok notifempty