Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53578
Change subject: Attempt to avoid conflicts with the new Ganglia module
......................................................................
Attempt to avoid conflicts with the new Ganglia module
Change-Id: I0abeb4f8c0cfebb2dce790278b36aafd900ace6b
---
M manifests/ganglia.pp
M modules/ganglia/manifests/monitor/packages.pp
2 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/53578/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 59ff4bd..ac8b652 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";
+ if !defined(Package["ganglia-monitor"]) {
+ 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;
}
diff --git a/modules/ganglia/manifests/monitor/packages.pp
b/modules/ganglia/manifests/monitor/packages.pp
index 1817e0f..d6aeac3 100644
--- a/modules/ganglia/manifests/monitor/packages.pp
+++ b/modules/ganglia/manifests/monitor/packages.pp
@@ -1,5 +1,7 @@
class ganglia::monitor::packages {
- package { "ganglia-monitor": ensure => latest }
+ if !defined(Package["ganglia-monitor"]) {
+ package { "ganglia-monitor": ensure => latest }
+ }
file { "/etc/init/ganglia-monitor.conf":
source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor.conf",
--
To view, visit https://gerrit.wikimedia.org/r/53578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0abeb4f8c0cfebb2dce790278b36aafd900ace6b
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
