Filippo Giunchedi has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/206127

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/206127/1

diff --git a/modules/graphite/manifests/carbon_c_relay.pp 
b/modules/graphite/manifests/carbon_c_relay.pp
index e1f35d8..fceb9f5 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',
+        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: newchange
Gerrit-Change-Id: Ibdf73e8b97696566bbd311a1c56f0ebc62f94d10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to