From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 10:30:11 +0000 (+0200)
Subject: remove porterbox purpose when we add the porterbox blurb to the motd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=73953673601107f75abcdc247547fc7ecde73e8a;p=mirror%2Fdsa-puppet.git

remove porterbox purpose when we add the porterbox blurb to the motd
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 41aa80822..10aeec271 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -52,6 +52,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   end
   if classes.include?("roles::porterbox")
     entries += ", the Debian #{arch} porterbox"
+    p.delete('porterbox')
   end
 
   if p.size() > 0