move logic out of main manifest

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 77007e1075e710256d67607bcfcae39141f9fce5..75bac4cca95810089d3ccb6bd8a4abb70b580fd6 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,7 +38,9 @@ node default {
                include ganeti2
        }
 
-       if $::hostname in [finzi,fano,fasch,field] {
+       if $::kernel == Linux {
+               include linux
+       } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
@@ -112,12 +114,6 @@ node default {
                include named::recursor
        }
 
-       if $::kernel == 'Linux' {
-               include ferm
-               include ferm::per-host
-               include entropykey
-       }
-
        if $::hostname in [diabelli,nono,spohr] {
                include dacs
        }

diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
new file mode 100644 (file)
index 0000000..8977b1b
--- /dev/null
+++ b/modules/linux/manifests/init.pp
@@ -0,0 +1,5 @@
+class linux {
+       include ferm
+       include ferm::per-host
+       include entropykey
+}