From 292d9b616985c165fab7298fefde4169dca6dba7 Mon Sep 17 00:00:00 2001
From: Udo Waechter <u.waechter@mysportgroup.de>
Date: Fri, 23 May 2014 17:51:30 +0200
Subject: [PATCH] getting rid of ganglia::cron::gmetric

---
 manifests/init.pp         | 18 +++++++++---------
 manifests/puppetmaster.pp | 32 +++++++++++++++++---------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 68798ac..6b19372 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -112,15 +112,15 @@ class puppet (
         }
       }
 
-      if defined(Class['ganglia::monitor']) {
-        Ganglia::Gmetric::Cron {
-          source => 'puppet/ganglia',
-          ensure => $ensure,
-        }
-
-        ganglia::gmetric::cron { 'puppetd_lastrun.sh': runwhen => '5'; 'puppetd_runtime.sh': runwhen => '15'; }
-
-      }
+#      if defined(Class['ganglia::monitor']) {
+#        Ganglia::Gmetric::Cron {
+#          source => 'puppet/ganglia',
+#          ensure => $ensure,
+#        }
+#
+#        ganglia::gmetric::cron { 'puppetd_lastrun.sh': runwhen => '5'; 'puppetd_runtime.sh': runwhen => '15'; }
+#
+#      }
     }
   }
   $puppet_user = $operatingsystem ? {
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 48b8bcc..da6dc0d 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -1,4 +1,6 @@
-class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
+class puppet::puppetmaster (
+  $ensure   = 'present',
+  $puppetqd = false) {
   require 'puppet::common'
 
   if !defined(Class['puppet::puppetlabs_apt']) {
@@ -24,20 +26,20 @@ class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
     }
   }
 
-  if defined(Class['ganglia::monitor']) {
-    Ganglia::Gmetric::Cron {
-      source => 'puppet/ganglia',
-      ensure => $ensure,
-    }
-
-    ganglia::gmetric::cron {
-      'puppetmaster.rb':
-        runwhen => '5';
-
-      'puppetmaster_compiletime.rb':
-        runwhen => '60',
-    }
-  }
+  #  if defined(Class['ganglia::monitor']) {
+  #    Ganglia::Gmetric::Cron {
+  #      source => 'puppet/ganglia',
+  #      ensure => $ensure,
+  #    }
+  #
+  #    ganglia::gmetric::cron {
+  #      'puppetmaster.rb':
+  #        runwhen => '5';
+  #
+  #      'puppetmaster_compiletime.rb':
+  #        runwhen => '60',
+  #    }
+  #  }
 
   # ## remove disk reports from time to time
   tidy { "${::puppet_vardir}/reports":