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
if scope.lookupvar('::cluster').to_s != 'undefined'
purp += "\n This server is a node in ganeti cluster: "
purp += scope.lookupvar('::cluster').to_s + ":\n"
- purp += "\t" + scope.lookupvar('::cluster_nodes').sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+ purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
if @lsbmajdistrelease >= '7'
purp += ""
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