get porterbox info from ldap

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index dcc156c04565c0a382f2fe4e86615934866c5ece..54632b4c63c6c1a071a60da89eb3e130100563dc 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -193,20 +193,6 @@ services:
     - kaufmann.debian.org
   wiki:
     - wilder.debian.org
-  # new style porterbox (schroot, dd installable packages etc)
-  porterbox:
-    # once they are all on new-style, we can use ldap for this
-    - agricola.debian.org
-    - barriere.debian.org
-    - eder.debian.org
-    - falla.debian.org
-    - fischer.debian.org
-    - gabrielli.debian.org
-    - harris.debian.org
-    - merulo.debian.org
-    - partch.debian.org
-    - smetana.debian.org
-    - zelenka.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index cca270c5aec2ab041452a8d56ac2d656dcece977..cfbaa9c4ce775175c9b5093c53a3c44ab08aaddb 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -14,6 +14,7 @@ module Puppet::Parser::Functions
       end
       nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml"])
       nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
+      nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))
 
       if lookupvar('::mta') == 'exim4'
         unless nodeinfo['heavy_exim']