ceph-infra: include iscsi nodes for logrotate

The iscsi nodes aren't included in the logrotate condition.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 85643edfe382d34a77fabbd97a4d937b8b74d4e6)

diff --git a/roles/ceph-infra/tasks/main.yml b/roles/ceph-infra/tasks/main.yml
index 77337b6e645370706f411087c982710452850229..40d5876a19e95034573629877de5d0678d5b6ebe 100644 (file)
--- 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 c2ed6c0251d7d07e5fc9d1a10b346e706c2b7366..e8be47396e017a71e480888a177fd685be06b298 100644 (file)
--- 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