put nfs-server in main manifest

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f287164dfb23c0d51ee08f13bb573a4f92c65e37..c9afa69bf21540f48eaa4122333c6d8a04550b44 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -98,6 +98,12 @@ node default {
     }
     include ferm::per-host
 
+    case $hostname {
+        ravel,spohr: {
+            include nfs-server
+        }
+    }
+
     case $brokenhosts {
         "true":    { include hosts }
     }

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 5a9d48b69ab6b511945b4207eb82e2e101a905af..a711c07f4ca36771ce70c0addb95214d854a7590 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -17,12 +17,6 @@ class ferm::per-host {
         }
     }
 
-    case $hostname {
-        ravel,spohr: {
-            include ferm::nfs-server
-        }
-    }
-
     case $hostname {
         piatti,samosa: {
            @ferm::rule { "dsa-udd-stunnel":