X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6c7ec54d0b71ebd5c4222578c8b3ab940357e292;hb=5ca040c29e73f804ea72c4af3887aa686c917c29;hp=be89e07236f65d95f631bfe4dffcc30999524f3b;hpb=3561e0cdfcd7bb773c6431f56409002f632ad083;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index be89e0723..6c7ec54d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,9 +40,15 @@ node default {
     }
     case $kvmdomain {
         "true": {
-            package { acpid: ensure => installed }
-            case getfromhash($nodeinfo, 'squeeze') {
-                true:  { package { acpi-support-base: ensure => installed } }
+            case $debarchitecture {
+                kfreebsd-amd64,kfreebsd-i386: {
+                }
+                default: {
+                    package { acpid: ensure => installed }
+                    case getfromhash($nodeinfo, 'squeeze') {
+                        true:  { package { acpi-support-base: ensure => installed } }
+                    }
+                }
             }
         }
     }
@@ -143,17 +149,9 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,tchaikovsky: {
+        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
             include krb
         }
-        draghi,quantz: {
-            include krb
-            include afs
-        }
-        lamb,locke,rautavaara,rietz: {
-            include krb
-            include afs::server
-        }
     }
 
     case $hostname {