From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 26 Sep 2019 07:34:59 +0000 (+0200)
Subject: Ignore local package trapperkeeper-webserver-jetty9-clojure on puppetmaster, cf.... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=43f016d839e1a4ffa48052e8bc1524f712a6dd84;p=mirror%2Fdsa-puppet.git

Ignore local package trapperkeeper-webserver-jetty9-clojure on puppetmaster, cf. Debian#924005, Debian#930562
---

diff --git a/modules/roles/manifests/puppetmaster.pp b/modules/roles/manifests/puppetmaster.pp
index af3855d32..9886652ec 100644
--- a/modules/roles/manifests/puppetmaster.pp
+++ b/modules/roles/manifests/puppetmaster.pp
@@ -11,4 +11,21 @@ class roles::puppetmaster {
     target_user => 'puppet',
     collect_tag => 'puppetmaster',
   }
+
+  # we have installed a newer trapperkeeper-webserver-jetty9-clojure,
+  # cf. Debian#924005, Debian#930562
+  if versioncmp(Timestamp().strftime('%F'), '2019-12-01') <= 0 {
+    $ensure = versioncmp($::operatingsystemrelease, '10.1') <= 0 ? {
+      true    => 'present',
+      default => 'absent',
+    }
+    file { '/etc/nagios/obsolete-packages-ignore.d/trapperkeeper-webserver-jetty9-clojure':
+      content => "trapperkeeper-webserver-jetty9-clojure\n",
+    }
+  } elsif versioncmp(Timestamp().strftime('%F'), '2020-02-01') <= 0 {
+    notify {'Temporary ignore rule expired, package should be in the archive':
+      loglevel => warning, }
+  } else {
+    fail('Clean up roles::puppetmaster')
+  }
 }