[MediaWiki-commits] [Gerrit] ganglia: do not start meta-service on jessie/systemd - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: ganglia: do not start meta-service on jessie/systemd
..
ganglia: do not start meta-service on jessie/systemd
When using systemd, we start each aggregator instance
separately from a template and each is their own service (I10726144b4f21b3).
So we don't need this 'meta-service' there that we used on upstart
which started all the instances with a script.
Bug:T124197
Change-Id: I91c009c0b814176ad55d71fbd606fb209cde221a
---
M modules/ganglia/manifests/monitor/aggregator.pp
1 file changed, 8 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ganglia/manifests/monitor/aggregator.pp
b/modules/ganglia/manifests/monitor/aggregator.pp
index d028dfc..a350556 100644
--- a/modules/ganglia/manifests/monitor/aggregator.pp
+++ b/modules/ganglia/manifests/monitor/aggregator.pp
@@ -42,15 +42,13 @@
site_instances{ $sites: }
-if os_version('debian >= jessie') {
- $ganglia_provider = 'systemd'
-} else {
- $ganglia_provider = 'upstart'
-}
-
-service { 'ganglia-monitor-aggregator':
-ensure => running,
-provider => $ganglia_provider,
-name => 'ganglia-monitor-aggregator',
+# with systemd each instance is a separate service spawned from a template
+# this is the old service that started multiple aggregators with upstart
+if $::initsystem == 'upstart' {
+service { 'ganglia-monitor-aggregator':
+ensure => running,
+provider => upstart,
+name => 'ganglia-monitor-aggregator',
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/277354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91c009c0b814176ad55d71fbd606fb209cde221a
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia: do not start meta-service on jessie/systemd - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277354
Change subject: ganglia: do not start meta-service on jessie/systemd
..
ganglia: do not start meta-service on jessie/systemd
When on jessie/systemd, we start each aggregator instance
separately from a template and each is their own service (I10726144b4f21b3).
So we don't need this 'meta-service' there that we used on upstart
which started all the instances with a script.
Bug:T124197
Change-Id: I91c009c0b814176ad55d71fbd606fb209cde221a
---
M modules/ganglia/manifests/monitor/aggregator.pp
1 file changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/277354/1
diff --git a/modules/ganglia/manifests/monitor/aggregator.pp
b/modules/ganglia/manifests/monitor/aggregator.pp
index d82c860..5d8863f 100644
--- a/modules/ganglia/manifests/monitor/aggregator.pp
+++ b/modules/ganglia/manifests/monitor/aggregator.pp
@@ -35,15 +35,13 @@
site_instances{ $sites: }
-if os_version('debian >= jessie') {
- $ganglia_provider = 'systemd'
-} else {
- $ganglia_provider = 'upstart'
-}
-
-service { 'ganglia-monitor-aggregator':
-ensure => running,
-provider => $ganglia_provider,
-name => 'ganglia-monitor-aggregator',
+# on jessie/upstart each instance is a separate service spawned
+# from a template in instance.pp, so this is not needed anymore
+if os_version('debian < jessie') {
+service { 'ganglia-monitor-aggregator':
+ensure => running,
+provider => upstart
+name => 'ganglia-monitor-aggregator',
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/277354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91c009c0b814176ad55d71fbd606fb209cde221a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
