Mark Bergsma has submitted this change and it was merged.
Change subject: Revert "Attempt to avoid conflicts with the new Ganglia module"
......................................................................
Revert "Attempt to avoid conflicts with the new Ganglia module"
This reverts commit 332c5a020c0358819b435e480a00ddd1d2c2c650
Change-Id: I68c359481d2aed562ffe584dd3ae2960c004aa2b
---
M manifests/ganglia.pp
1 file changed, 9 insertions(+), 11 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 48746b7..59ff4bd 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -202,18 +202,16 @@
}
}
ganglia-monitor: {
- include ::ganglia::monitor::packages
-
- # package {
- # "gmond":
- # before => Package[ganglia-monitor],
- # ensure => purged;
- # "ganglia-monitor":
- # ensure => present,
- # alias => "gmond-package";
- # }
+ 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;
}
--
To view, visit https://gerrit.wikimedia.org/r/53576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68c359481d2aed562ffe584dd3ae2960c004aa2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
