Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --combined manifests/site.pp
index d90e581,a7b6838..2fecb32
--- 1/manifests/site.pp
--- 2/manifests/site.pp
+++ b/manifests/site.pp
@@@ -74,14 -74,7 +74,14 @@@ node default 
      }
  
      case extractnodeinfo($nodeinfo, 'buildd') {
 -         true:  { include buildd }
 +         true:  {
 +             include buildd
 +             case $kernel {
 +                 'Linux': {
 +                     include ferm
 +                 }
 +             }
 +         }
      }
  
      case $hostname {
@@@ -91,7 -84,7 +91,7 @@@
      }
  
      case $hostname {
-         logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani: { include ferm }
+         logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball: { include ferm }
      }
      case $hostname {
          piatti: {