From 7a0ad0b46e8c854ea1233cc6a781683fd69fa47e Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Tue, 27 Jul 2010 09:00:33 +0100 Subject: [PATCH] put nfs-server in main manifest Signed-off-by: Stephen Gran --- manifests/site.pp | 6 ++++++ modules/ferm/manifests/per-host.pp | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index f287164d..c9afa69b 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 5a9d48b6..a711c07f 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": -- 2.39.2