Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53575
Change subject: Attempt to avoid conflicts with the new Ganglia module
......................................................................
Attempt to avoid conflicts with the new Ganglia module
Change-Id: I8d54b5b3f7aec1d109023d2e5ea6b1a06bfb9283
---
M manifests/ganglia.pp
1 file changed, 23 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/53575/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 59ff4bd..af8303f 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -202,16 +202,18 @@
}
}
ganglia-monitor: {
- package {
- "gmond":
- before => Package[ganglia-monitor],
- ensure => purged;
- "ganglia-monitor":
- ensure => present,
- alias => "gmond-package";
- }
+ include ::ganglia::monitor::packages
+
+ # package {
+ # "gmond":
+ # before => Package[ganglia-monitor],
+ # ensure => purged;
+ # "ganglia-monitor":
+ # ensure => present,
+ # alias => "gmond-package";
+ # }
- file { [ "/etc/ganglia/conf.d",
"/usr/lib/ganglia/python_modules" ]:
+ file { [ "/etc/ganglia/conf.d",
"/usr/lib/ganglia/python_modules" ]:
require => Package[ganglia-monitor],
ensure => directory;
}
@@ -379,16 +381,18 @@
}
}
- # Class: ganglia::aggregator
- # for the machine class which listens on multicast and
- # collects all the ganglia information from other sources
- class aggregator {
- # This overrides the default ganglia-monitor script
- # with one that starts up multiple instances of gmond
- file { "/etc/init.d/ganglia-monitor":
- source => "puppet:///files/ganglia/ganglia-monitor",
- mode => 0555,
- ensure => present
+ if $::realm == "labs" {
+ # Class: ganglia::aggregator
+ # for the machine class which listens on multicast and
+ # collects all the ganglia information from other sources
+ class aggregator {
+ # This overrides the default ganglia-monitor script
+ # with one that starts up multiple instances of gmond
+ file { "/etc/init.d/ganglia-monitor":
+ source =>
"puppet:///files/ganglia/ganglia-monitor",
+ mode => 0555,
+ ensure => present
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d54b5b3f7aec1d109023d2e5ea6b1a06bfb9283
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
