From: David Galloway <dgallowa@redhat.com>
Date: Thu, 17 Jun 2021 23:17:15 +0000 (-0400)
Subject: ansible: Set tmpwatch/tmpcleaner args correctly
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1849%2Fhead;p=ceph-build.git

ansible: Set tmpwatch/tmpcleaner args correctly

https://github.com/ceph/ceph-build/pull/1838#pullrequestreview-686910470

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ansible/examples/slave.yml b/ansible/examples/slave.yml
index 81054676..b9dc5fd8 100644
--- a/ansible/examples/slave.yml
+++ b/ansible/examples/slave.yml
@@ -58,6 +58,7 @@
           - ant
           - tmpreaper
         tmp_cleaner_name: tmpreaper
+        tmp_cleaner_args: "--runtime=0 30d /tmp/"
       when: ansible_os_family == "Debian"
       tags: always
 
@@ -157,6 +158,7 @@
           - libffi-devel
           - tmpwatch
         tmp_cleaner_name: tmpwatch
+        tmp_cleaner_args: "30d /tmp/"
       when: ansible_os_family == "RedHat"
       tags: always
 
@@ -251,6 +253,7 @@
           - osc
           - build
         tmp_cleaner_name: tmpwatch
+        tmp_cleaner_args: "30d /tmp/"
       when: ansible_os_family == "Suse"
       tags: always
 
@@ -702,7 +705,7 @@
           cron:
             name: "Delete /tmp files that have not been accessed in 30 days"
             special_time: daily
-            job: "{{ tmp_cleaner_name }} --runtime=0 30d /tmp/"
+            job: "{{ tmp_cleaner_name }} {{ tmp_cleaner_args }}"
       when: permanent|bool
       tags: tmp