Filippo Giunchedi has submitted this change and it was merged.
Change subject: Revert "graphite: hotname is a fact, qualify"
......................................................................
Revert "graphite: hotname is a fact, qualify"
Qualifying the hostname variable changed it to something that we can't work
with:
-exec /usr/bin/carbon-c-relay -H graphite1001_local -p 1903 -f
/etc/carbon/local-relay.conf
+exec /usr/bin/carbon-c-relay -H graphite.wikimedia.org_local -p 1903 -f
/etc/carbon/local-relay.conf
This reverts commit ca0957e0eeecfa09f993bae220fb83e76319f105.
Bug: T97251
Change-Id: Iae461906f8fe98851bf1b98aa5c8fd7358500d93
---
M modules/graphite/templates/initscripts/frontend-relay.upstart.erb
M modules/graphite/templates/initscripts/local-relay.upstart.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
index 48a6a32..fde487e 100644
--- a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
@@ -12,4 +12,4 @@
# it is possible there's another carbon-c-relay running on the same host, so
# change the hostname
-exec /usr/bin/carbon-c-relay -H <%= "#{@hostname}_frontend" -%> -p 2003 -f
/etc/carbon/frontend-relay.conf
+exec /usr/bin/carbon-c-relay -H <%= "#{hostname}_frontend" -%> -p 2003 -f
/etc/carbon/frontend-relay.conf
diff --git a/modules/graphite/templates/initscripts/local-relay.upstart.erb
b/modules/graphite/templates/initscripts/local-relay.upstart.erb
index 3575bb9..3ca5694 100644
--- a/modules/graphite/templates/initscripts/local-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/local-relay.upstart.erb
@@ -12,4 +12,4 @@
# it is possible there's another carbon-c-relay running on the same host, so
# change the hostname
-exec /usr/bin/carbon-c-relay -H <%= "#{@hostname}_local" -%> -p 1903 -f
/etc/carbon/local-relay.conf
+exec /usr/bin/carbon-c-relay -H <%= "#{hostname}_local" -%> -p 1903 -f
/etc/carbon/local-relay.conf
--
To view, visit https://gerrit.wikimedia.org/r/215814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae461906f8fe98851bf1b98aa5c8fd7358500d93
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@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
