fixing weird class setup

we had some weird class setup which caused some problems on 2.6
(see puppet bug #4242 for more info). This commit cleans that
weird setup up and decouples a lot of things.

1 files changed, 16 insertions, 16 deletions

diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index df0828c..e0744a0 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -1,22 +1,22 @@
 # handle if_ and if_err_ plugins
-class munin::plugins::interfaces inherits munin::plugins::base {
+class munin::plugins::interfaces  { 
 
-    $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
-    munin::plugin {
+  $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
+  munin::plugin {
     $ifs: ensure => "if_";
+  }
+  case $operatingsystem {
+    openbsd: {
+      $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+      munin::plugin{
+        $if_errs: ensure => "if_errcoll_";
+      }
     }
-    case $operatingsystem {
-        openbsd: {
-            $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
-              munin::plugin{
-            $if_errs: ensure => "if_errcoll_";
-          }
-        }
-        default: {
-            $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
-              munin::plugin{
-                $if_errs: ensure => "if_err_";
-          }
-        }
+    default: {
+      $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
+      munin::plugin{
+        $if_errs: ensure => "if_err_";
+      }
     }
+  }
 }