Class[] -> Class[] requirement replaced by an anchor

3 files changed, 34 insertions, 10 deletions

diff --git a/Rakefile b/Rakefile
index 3bc7abd..e9e821a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,7 +18,6 @@ task :librarian_spec_prep do
   unless File.directory?("#{pwd}/spec/fixtures/modules/munin")
     sh "ln -s #{pwd} #{pwd}/spec/fixtures/modules/munin"
   end
-  sh 'ls -laF spec/fixtures/modules'
 end
 task :spec_prep => :librarian_spec_prep
 
diff --git a/manifests/client.pp b/manifests/client.pp
index 4d70cac..c33ec0d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -12,13 +12,39 @@ class munin::client(
   $shorewall_collector_source = 'net',
   $export_tag = 'munin'
 ) {
+  anchor { 'munin::client::installed': }
+
   case $::operatingsystem {
-    openbsd: { include munin::client::openbsd }
-    darwin: { include munin::client::darwin }
-    debian,ubuntu: { include munin::client::debian }
-    gentoo: { include munin::client::gentoo }
-    centos: { include munin::client::package }
-    default: { include munin::client::base }
+    openbsd: {
+      class { 'munin::client::openbsd':
+        before => Anchor['munin::client::installed']
+      }
+    }
+    darwin: {
+      class { 'munin::client::darwin':
+        before => Anchor['munin::client::installed']
+      }
+    }
+    debian,ubuntu: {
+      class { 'munin::client::debian':
+        before => Anchor['munin::client::installed']
+      }
+    }
+    gentoo: {
+      class { 'munin::client::gentoo':
+        before => Anchor['munin::client::installed']
+      }
+    }
+    centos: {
+      class { 'munin::client::package':
+        before => Anchor['munin::client::installed']
+      }
+    }
+    default: {
+      class { 'munin::client::base':
+        before => Anchor['munin::client::installed']
+      }
+    }
   }
   if $munin::client::manage_shorewall {
     class{'shorewall::rules::munin':
diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
index e0826f0..e1a57d9 100644
--- a/manifests/plugins/setup.pp
+++ b/manifests/plugins/setup.pp
@@ -1,12 +1,10 @@
 # Set up the munin plugins for a node
 class munin::plugins::setup {
 
-  # This is required for the munin-node service and package requirements below.
-  Class['munin::client'] -> Class['munin::plugins::setup']
-
   file {
     [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
       ensure    => directory,
+      require   => Anchor['munin::client::installed'],
       ignore    => 'snmp_*',
       checksum  => mtime,
       recurse   => true,
@@ -18,6 +16,7 @@ class munin::plugins::setup {
       mode      => '0755';
     '/etc/munin/plugin-conf.d/munin-node':
       ensure    => present,
+      require   => Anchor['munin::client::installed'],
       notify    => Service['munin-node'],
       owner     => root,
       group     => 0,