remove hiera

1 files changed, 14 insertions, 14 deletions

diff --git a/manifests/server.pp b/manifests/server.pp
index 81d293a..69b253d 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,27 +1,27 @@
-class mysql::server {
-
+class mysql::server (
+  $manage_shorewall = false,
+  $manage_munin     = false,
+  $manage_nagios    = false
+) {
   case $::operatingsystem {
-    gentoo: { include mysql::server::gentoo }
-    centos: { include mysql::server::centos }
-    debian: { include mysql::server::debian }
+    gentoo:  { include mysql::server::gentoo }
+    centos:  { include mysql::server::centos }
+    debian:  { include mysql::server::debian }
     default: { include mysql::server::base }
   }
 
-  if hiera('use_munin',false) {
+  if $mysql::manage_munin {
     case $::operatingsystem {
-      debian: { include mysql::server::munin::debian }
+      debian:  { include mysql::server::munin::debian }
       default: { include mysql::server::munin::default }
     }
   }
 
-  if hiera('use_nagios',false) {
-    case hiera('nagios_check_mysql',false) {
-      false: { info("We don't do nagioschecks for mysql on ${::fqdn}" ) }
-      default: { include mysql::server::nagios }
-    }
-  }
+  if $mysql::manage_nagios {
+    include mysql::server::nagios
+  } 
 
-  if hiera('use_shorewall',false) {
+  if $mysql::manage_shorewall {
     include shorewall::rules::mysql
   }
 }