Dzahn has submitted this change and it was merged.
Change subject: ganglia: no dependency for old upstart service on systemd
......................................................................
ganglia: no dependency for old upstart service on systemd
This service dependency is only valid on upstart systems.
When using systemd each aggregator is a separate service and this
one doesn't exist anymore and puppet will fail.
Bug:T124197
Change-Id: Ib3278fb515158d4f64337bff99daad1321697b88
---
M modules/ganglia/manifests/monitor/aggregator/instance.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ganglia/manifests/monitor/aggregator/instance.pp
b/modules/ganglia/manifests/monitor/aggregator/instance.pp
index 5a6e25f..2aaaef7 100644
--- a/modules/ganglia/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia/manifests/monitor/aggregator/instance.pp
@@ -1,6 +1,10 @@
define ganglia::monitor::aggregator::instance($monitored_site) {
- Ganglia::Monitor::Aggregator::Instance[$title] ->
- Service['ganglia-monitor-aggregator']
+
+ # not needed anymore and breaks on systemd
+ if $::initsystem == 'upstart' {
+ Ganglia::Monitor::Aggregator::Instance[$title] ->
+ Service['ganglia-monitor-aggregator']
+ }
include ganglia::configuration
include network::constants
--
To view, visit https://gerrit.wikimedia.org/r/277455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3278fb515158d4f64337bff99daad1321697b88
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
