Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: stop system carbon-c-relay
......................................................................
graphite: stop system carbon-c-relay
graphite runs two carbon-c-relay instances separate from the system's
Change-Id: Ibdf73e8b97696566bbd311a1c56f0ebc62f94d10
---
M modules/graphite/manifests/carbon_c_relay.pp
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/graphite/manifests/carbon_c_relay.pp
b/modules/graphite/manifests/carbon_c_relay.pp
index e1f35d8..a32a5e5 100644
--- a/modules/graphite/manifests/carbon_c_relay.pp
+++ b/modules/graphite/manifests/carbon_c_relay.pp
@@ -20,6 +20,19 @@
template_name => 'frontend-relay',
}
+ # make sure the global carbon-c-relay doesn't run
+ file { '/etc/init/carbon-c-relay.override':
+ content => "manual\n",
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+
+ service { 'carbon-c-relay':
+ provider => 'upstart',
+ ensure => stopped,
+ }
+
file { '/etc/carbon/frontend-relay.conf':
content => template('graphite/frontend-relay.conf.erb'),
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/206127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdf73e8b97696566bbd311a1c56f0ebc62f94d10
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
