From: Héctor Orón Martínez <zumbi@debian.org>
Date: Mon, 27 Oct 2014 15:50:43 +0000 (+0100)
Subject: motd: do not check porterbox class, always included now
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=c54dc85e499b9c2ffe041ded769cf1da1453609d

motd: do not check porterbox class, always included now

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index cfed6dca..a91a1637 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -50,7 +50,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end
-  if p.delete('porterbox') or classes.include?("porterbox")
+  if p.delete('porterbox') or scope.lookupvar('site::nodeinfo').has_key?('porterbox')
     entries += ", the Debian #{arch} porterbox"
   end
 
@@ -129,7 +129,7 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
 end
 
 
-if classes.include?("porterbox")
+if scope.lookupvar('site::nodeinfo').has_key?('porterbox')
   purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:http://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.")
 end