puppet_modules/puppet
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getting rid of ganglia::cron::gmetric

Browse Source
This commit is contained in:
Udo Waechter
2014-05-23 17:51:30 +02:00
parent fcd9506f20
commit 292d9b6169
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/init.pp
View File

@@ -112,15 +112,15 @@ class puppet (
} }
} }
if defined(Class['ganglia::monitor']) { # if defined(Class['ganglia::monitor']) {
Ganglia::Gmetric::Cron { # Ganglia::Gmetric::Cron {
source => 'puppet/ganglia', # source => 'puppet/ganglia',
ensure => $ensure, # ensure => $ensure,
} # }
#
ganglia::gmetric::cron { 'puppetd_lastrun.sh': runwhen => '5'; 'puppetd_runtime.sh': runwhen => '15'; } # ganglia::gmetric::cron { 'puppetd_lastrun.sh': runwhen => '5'; 'puppetd_runtime.sh': runwhen => '15'; }
#
} # }
} }
} }
$puppet_user = $operatingsystem ? { $puppet_user = $operatingsystem ? {

32
manifests/puppetmaster.pp
View File

@@ -1,4 +1,6 @@
class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) { class puppet::puppetmaster (
$ensure = 'present',
$puppetqd = false) {
require 'puppet::common' require 'puppet::common'
if !defined(Class['puppet::puppetlabs_apt']) { if !defined(Class['puppet::puppetlabs_apt']) {
@@ -24,20 +26,20 @@ class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
} }
} }
if defined(Class['ganglia::monitor']) { # if defined(Class['ganglia::monitor']) {
Ganglia::Gmetric::Cron { # Ganglia::Gmetric::Cron {
source => 'puppet/ganglia', # source => 'puppet/ganglia',
ensure => $ensure, # ensure => $ensure,
} # }
#
ganglia::gmetric::cron { # ganglia::gmetric::cron {
'puppetmaster.rb': # 'puppetmaster.rb':
runwhen => '5'; # runwhen => '5';
#
'puppetmaster_compiletime.rb': # 'puppetmaster_compiletime.rb':
runwhen => '60', # runwhen => '60',
} # }
} # }
# ## remove disk reports from time to time # ## remove disk reports from time to time
tidy { "${::puppet_vardir}/reports": tidy { "${::puppet_vardir}/reports":