From: Stephen Gran <steve@lobefin.net>
Date: Tue, 27 Jul 2010 08:00:33 +0000 (+0100)
Subject: put nfs-server in main manifest
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7a0ad0b46e8c854ea1233cc6a781683fd69fa47e;p=mirror%2Fdsa-puppet.git

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 f287164df..c9afa69bf 100644
--- 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 5a9d48b69..a711c07f4 100644
--- 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":