Clean out old watcher pause files automatically

diff --git a/modules/ganeti2/files/cleanup-watcher-pause-file b/modules/ganeti2/files/cleanup-watcher-pause-file
new file mode 100755 (executable)
index 0000000..ea680b5
--- /dev/null
+++ b/modules/ganeti2/files/cleanup-watcher-pause-file
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+set -u
+
+P=/var/lib/ganeti/watcher.pause
+SKEW=1800
+
+if [ -e "$P" ]; then
+  until="$(cat "$P")"
+  deleteafter=$(( until + SKEW ))
+
+  now="$(date +%s)"
+
+  if [ "$deleteafter" -gt "$now" ]; then
+    rm "$P"
+  fi
+fi

diff --git a/modules/ganeti2/manifests/init.pp b/modules/ganeti2/manifests/init.pp
index ca56ab0..cb486df 100644 (file)
--- a/modules/ganeti2/manifests/init.pp
+++ b/modules/ganeti2/manifests/init.pp
@@ -17,6 +17,10 @@ class ganeti2 {
                ensure => installed
        }
 
-
        site::linux_module { 'tun': }
+
+       file { '/etc/cron.hourly/puppet-cleanup-watcher-pause-file':
+               source => 'puppet:///modules/ganeti2/cleanup-watcher-pause-file',
+               mode    => '0555',
+       }
 }